Mercurial > emacs

comparison configure.in @ 83548:c71725faff1a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from emacs@sv.gnu.org. Last-minute emacsclient rewrites be damned! Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-490 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-491 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-492 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-493 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-494 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-495 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-496 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-497 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-498 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-499 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-500 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-501 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-502 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-503 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-504 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-505 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-506 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-507 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-508 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-509 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-510 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-511 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-512 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-513 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-514 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-515 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-516 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-517 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-518 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-519 Update from CVS: etc/TUTORIAL.cn: Updated. * emacs@sv.gnu.org/emacs--devo--0--patch-520 Merge from erc--emacs--22 * emacs@sv.gnu.org/emacs--devo--0--patch-521 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-522 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-523 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-524 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-525 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-526 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-527 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-528 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-529 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-530 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-531 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-532 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-533 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-534 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-535 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-161 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-162 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-163 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-164 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-165 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-166 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-167 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-168 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-169 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-170 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-588
author Karoly Lorentey <lorentey@elte.hu>
date Sun, 03 Dec 2006 15:03:30 +0000
parents 0912b745fc75 33d92b32de0c
children 17e0dd217877
comparison
equal deleted inserted replaced
83547:0912b745fc75 83548:c71725faff1a
235 ## FreeBSD ports 235 ## FreeBSD ports
236 *-*-freebsd* ) 236 *-*-freebsd* )
237 opsys=freebsd 237 opsys=freebsd
238 case "${canonical}" in 238 case "${canonical}" in
239 alpha*-*-freebsd*) machine=alpha ;; 239 alpha*-*-freebsd*) machine=alpha ;;
240 ia64-*-freebsd*) machine=ia64 ;;
241 sparc64-*-freebsd*) machine=sparc ;;
242 powerpc-*-freebsd*) machine=macppc ;;
240 i[3456]86-*-freebsd*) machine=intel386 ;; 243 i[3456]86-*-freebsd*) machine=intel386 ;;
241 amd64-*-freebsd*|x86_64-*-freebsd*) machine=amdx86-64 ;; 244 amd64-*-freebsd*|x86_64-*-freebsd*) machine=amdx86-64 ;;
242 esac 245 esac
243 ;; 246 ;;
244 247
1480 1483
1481 dnl Do this early because it can frob feature test macros for Unix-98 &c. 1484 dnl Do this early because it can frob feature test macros for Unix-98 &c.
1482 AC_SYS_LARGEFILE 1485 AC_SYS_LARGEFILE
1483 1486
1484 1487
1488 ### The standard library on x86-64 GNU/Linux distributions can
1489 ### be located in either /usr/lib64 or /usr/lib.
1490 case "${canonical}" in
1491 x86_64-*-linux-gnu* )
1492 if test -d /usr/lib64; then
1493 AC_DEFINE(HAVE_X86_64_LIB64_DIR, 1,
1494 [Define to 1 if the file /usr/lib64 exists.])
1495 fi
1496 esac
1497
1485 dnl This function defintion taken from Gnome 2.0 1498 dnl This function defintion taken from Gnome 2.0
1486 dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) 1499 dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
1487 dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page 1500 dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page
1488 dnl also defines GSTUFF_PKG_ERRORS on error 1501 dnl also defines GSTUFF_PKG_ERRORS on error
1489 AC_DEFUN([PKG_CHECK_MODULES], [ 1502 AC_DEFUN([PKG_CHECK_MODULES], [
1774 AC_CHECK_HEADER(Carbon/Carbon.h, HAVE_CARBON=yes) 1787 AC_CHECK_HEADER(Carbon/Carbon.h, HAVE_CARBON=yes)
1775 fi 1788 fi
1776 if test "${window_system}" = x11 && test "${HAVE_CARBON}" = yes; then 1789 if test "${window_system}" = x11 && test "${HAVE_CARBON}" = yes; then
1777 if test "${with_carbon+set}" != set \ 1790 if test "${with_carbon+set}" != set \
1778 && test "${carbon_appdir_x+set}" != set; then 1791 && test "${carbon_appdir_x+set}" != set; then
1779 HAVE_CARBON=no 1792 for var in with_x with_x_toolkit with_gtk with_xim \
1793 with_xpm with_jpeg with_tiff with_gif with_png; do
1794 if eval test \"\${$var+set}\" = set; then
1795 HAVE_CARBON=no
1796 break
1797 fi
1798 done
1780 fi 1799 fi
1781 fi 1800 fi
1782 if test "${HAVE_CARBON}" = yes; then 1801 if test "${HAVE_CARBON}" = yes; then
1783 window_system=mac 1802 window_system=mac
1784 fi 1803 fi
2408 * ) carbon_appdir=${carbon_appdir_x} ;; 2427 * ) carbon_appdir=${carbon_appdir_x} ;;
2409 esac 2428 esac
2410 fi 2429 fi
2411 # We also have mouse menus. 2430 # We also have mouse menus.
2412 HAVE_MENUS=yes 2431 HAVE_MENUS=yes
2413
2414 tmp_CFLAGS="$CFLAGS"
2415 CFLAGS="$CFLAGS -framework Carbon"
2416 AC_CHECK_FUNC(CancelMenuTracking, have_cmt=yes, have_cmt=no)
2417 if test "$have_cmt" = yes; then
2418 AC_DEFINE(HAVE_CANCELMENUTRACKING, 1,
2419 [Define to 1 if CancelMenuTracking is available (Mac OSX).])
2420 fi
2421 CFLAGS="$tmp_CFLAGS"
2422 fi 2432 fi
2423 2433
2424 ### Use session management (-lSM -lICE) if available 2434 ### Use session management (-lSM -lICE) if available
2425 HAVE_X_SM=no 2435 HAVE_X_SM=no
2426 if test "${HAVE_X11}" = "yes"; then 2436 if test "${HAVE_X11}" = "yes"; then