comparison configure @ 91040:14c4a6aac623

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 866-879) - Merge multi-tty branch - Update from CVS - Merge from emacs--rel--22 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-257
author Miles Bader <miles@gnu.org>
date Thu, 11 Oct 2007 16:14:00 +0000
parents b83d0dadb2a7 5039706521c9
children 35069180a991
comparison
equal deleted inserted replaced
91039:eefadc1e1d5e 91040:14c4a6aac623
1322 cat <<\_ACEOF 1322 cat <<\_ACEOF
1323 1323
1324 Optional Features: 1324 Optional Features:
1325 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) 1325 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
1326 --enable-FEATURE[=ARG] include FEATURE [ARG=yes] 1326 --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
1327 --enable-carbon-app[=DIR] [DIR=/Application] 1327 --enable-carbon-app[=DIR]
1328 specify install directory for Emacs.app on Mac OS X 1328 specify install directory for Emacs.app on Mac OS X
1329 [DIR=/Application]
1329 --enable-font-backend compile code of font-backend support 1330 --enable-font-backend compile code of font-backend support
1330 --enable-asserts compile code with asserts enabled 1331 --enable-asserts compile code with asserts enabled
1331 --enable-maintainer-mode enable make rules and dependencies not useful 1332 --enable-maintainer-mode
1332 (and sometimes confusing) to the casual installer 1333 enable make rules and dependencies not useful (and
1334 sometimes confusing) to the casual installer
1333 --enable-locallisppath=PATH 1335 --enable-locallisppath=PATH
1334 directories Emacs should search for lisp files 1336 directories Emacs should search for lisp files
1335 specific to this site 1337 specific to this site
1336 --disable-largefile omit support for large files 1338 --disable-largefile omit support for large files
1337 1339
1342 --without-pop don't support POP mail retrieval with movemail 1344 --without-pop don't support POP mail retrieval with movemail
1343 --with-kerberos support Kerberos-authenticated POP 1345 --with-kerberos support Kerberos-authenticated POP
1344 --with-kerberos5 support Kerberos version 5 authenticated POP 1346 --with-kerberos5 support Kerberos version 5 authenticated POP
1345 --with-hesiod support Hesiod to get the POP server host 1347 --with-hesiod support Hesiod to get the POP server host
1346 --without-sound don't compile with sound support 1348 --without-sound don't compile with sound support
1347 --with-x-toolkit=KIT use an X toolkit 1349 --with-x-toolkit=KIT use an X toolkit (KIT one of: yes, lucid, athena,
1348 (KIT = yes/lucid/athena/motif/gtk/no) 1350 motif, gtk, no)
1349 --with-xpm use -lXpm for displaying XPM images 1351 --with-xpm use -lXpm for displaying XPM images
1350 --with-jpeg use -ljpeg for displaying JPEG images 1352 --with-jpeg use -ljpeg for displaying JPEG images
1351 --with-tiff use -ltiff for displaying TIFF images 1353 --with-tiff use -ltiff for displaying TIFF images
1352 --with-gif use -lgif (or -lungif) for displaying GIF images 1354 --with-gif use -lgif (or -lungif) for displaying GIF images
1353 --with-png use -lpng for displaying PNG images 1355 --with-png use -lpng for displaying PNG images
1354 --with-freetype use -lfreetype for local fonts support 1356 --with-freetype use -lfreetype for local fonts support
1355 --with-xft use -lXft for anti aliased fonts 1357 --with-xft use -lXft for anti aliased fonts
1356 --with-gpm use -lgpm for mouse support on a GNU/Linux console 1358 --with-gpm use -lgpm for mouse support on a GNU/Linux console
1357 --with-rsvg use -lrsvg-2 for displaying SVG images 1359 --with-rsvg use -lrsvg-2 for displaying SVG images
1358 --with-gtk use GTK (same as --with-x-toolkit=gtk) 1360 --with-gtk use GTK (same as --with-x-toolkit=gtk)
1359 --with-pkg-config-prog Path to pkg-config to use for finding GTK and librsvg 1361 --with-pkg-config-prog Path to pkg-config for finding GTK and librsvg
1360 --without-toolkit-scroll-bars 1362 --without-toolkit-scroll-bars
1361 don't use Motif or Xaw3d scroll bars 1363 don't use Motif or Xaw3d scroll bars
1364 --without-xaw3d don't use Xaw3d
1362 --without-xim don't use X11 XIM 1365 --without-xim don't use X11 XIM
1363 --without-carbon don't use Carbon GUI on Mac OS X 1366 --without-carbon don't use Carbon GUI on Mac OS X
1364 --with-x use the X Window System 1367 --with-x use the X Window System
1365 1368
1366 Some influential environment variables: 1369 Some influential environment variables:
1826 gamedir='${localstatedir}/games/emacs' 1829 gamedir='${localstatedir}/games/emacs'
1827 1830
1828 gameuser=games 1831 gameuser=games
1829 1832
1830 1833
1834
1831 # Check whether --with-gcc was given. 1835 # Check whether --with-gcc was given.
1832 if test "${with_gcc+set}" = set; then 1836 if test "${with_gcc+set}" = set; then
1833 withval=$with_gcc; 1837 withval=$with_gcc;
1834 fi 1838 fi
1839
1835 1840
1836 1841
1837 # Check whether --with-pop was given. 1842 # Check whether --with-pop was given.
1838 if test "${with_pop+set}" = set; then 1843 if test "${with_pop+set}" = set; then
1839 withval=$with_pop; if test "$withval" = yes; then 1844 withval=$with_pop; if test "$withval" = yes; then
1850 1855
1851 fi 1856 fi
1852 1857
1853 1858
1854 1859
1860
1855 # Check whether --with-kerberos was given. 1861 # Check whether --with-kerberos was given.
1856 if test "${with_kerberos+set}" = set; then 1862 if test "${with_kerberos+set}" = set; then
1857 withval=$with_kerberos; if test "$withval" = yes; then 1863 withval=$with_kerberos; if test "$withval" = yes; then
1858 cat >>confdefs.h <<\_ACEOF 1864 cat >>confdefs.h <<\_ACEOF
1859 #define KERBEROS 1 1865 #define KERBEROS 1
1860 _ACEOF 1866 _ACEOF
1861 1867
1862 fi 1868 fi
1863 fi 1869 fi
1870
1864 1871
1865 1872
1866 1873
1867 # Check whether --with-kerberos5 was given. 1874 # Check whether --with-kerberos5 was given.
1868 if test "${with_kerberos5+set}" = set; then 1875 if test "${with_kerberos5+set}" = set; then
1879 #define KERBEROS5 1 1886 #define KERBEROS5 1
1880 _ACEOF 1887 _ACEOF
1881 1888
1882 fi 1889 fi
1883 fi 1890 fi
1891
1884 1892
1885 1893
1886 # Check whether --with-hesiod was given. 1894 # Check whether --with-hesiod was given.
1887 if test "${with_hesiod+set}" = set; then 1895 if test "${with_hesiod+set}" = set; then
1888 withval=$with_hesiod; if test "$withval" = yes; then 1896 withval=$with_hesiod; if test "$withval" = yes; then
1925 with_x_toolkit=$val 1933 with_x_toolkit=$val
1926 1934
1927 fi 1935 fi
1928 1936
1929 1937
1938
1930 # Check whether --with-xpm was given. 1939 # Check whether --with-xpm was given.
1931 if test "${with_xpm+set}" = set; then 1940 if test "${with_xpm+set}" = set; then
1932 withval=$with_xpm; 1941 withval=$with_xpm;
1933 fi 1942 fi
1934 1943
1997 if test "${with_toolkit_scroll_bars+set}" = set; then 2006 if test "${with_toolkit_scroll_bars+set}" = set; then
1998 withval=$with_toolkit_scroll_bars; 2007 withval=$with_toolkit_scroll_bars;
1999 fi 2008 fi
2000 2009
2001 2010
2011 # Check whether --with-xaw3d was given.
2012 if test "${with_xaw3d+set}" = set; then
2013 withval=$with_xaw3d;
2014 fi
2015
2016
2002 # Check whether --with-xim was given. 2017 # Check whether --with-xim was given.
2003 if test "${with_xim+set}" = set; then 2018 if test "${with_xim+set}" = set; then
2004 withval=$with_xim; 2019 withval=$with_xim;
2005 fi 2020 fi
2006 2021
2007 2022
2008 # Check whether --with-carbon was given. 2023 # Check whether --with-carbon was given.
2009 if test "${with_carbon+set}" = set; then 2024 if test "${with_carbon+set}" = set; then
2010 withval=$with_carbon; 2025 withval=$with_carbon;
2011 fi 2026 fi
2027
2012 2028
2013 # Check whether --enable-carbon-app was given. 2029 # Check whether --enable-carbon-app was given.
2014 if test "${enable_carbon_app+set}" = set; then 2030 if test "${enable_carbon_app+set}" = set; then
2015 enableval=$enable_carbon_app; carbon_appdir_x=${enableval} 2031 enableval=$enable_carbon_app; carbon_appdir_x=${enableval}
2016 fi 2032 fi
5402 echo "${ECHO_T}no" >&6; } 5418 echo "${ECHO_T}no" >&6; }
5403 fi 5419 fi
5404 5420
5405 5421
5406 if test "$MAKEINFO" != "no" && \ 5422 if test "$MAKEINFO" != "no" && \
5407 test x"`$MAKEINFO --version 2> /dev/null | $EGREP 'texinfo[^0-9]*([5-9]|4\.[6-9])'`" = x; then 5423 test x"`$MAKEINFO --version 2> /dev/null | $EGREP 'texinfo[^0-9]*([1-4][0-9]+|[5-9]|4\.[6-9]|4\.[1-5][0-9]+)'`" = x; then
5408 MAKEINFO=no 5424 MAKEINFO=no
5409 fi 5425 fi
5410 5426
5411 if test "$MAKEINFO" = "no"; then 5427 if test "$MAKEINFO" = "no"; then
5412 { { echo "$as_me:$LINENO: error: makeinfo >= 4.6 is required " >&5 5428 { { echo "$as_me:$LINENO: error: makeinfo >= 4.6 is required " >&5
11296 if test "$USE_X_TOOLKIT" != "none" && test "$USE_X_TOOLKIT" != "maybe"; then 11312 if test "$USE_X_TOOLKIT" != "none" && test "$USE_X_TOOLKIT" != "maybe"; then
11297 { { echo "$as_me:$LINENO: error: Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}" >&5 11313 { { echo "$as_me:$LINENO: error: Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}" >&5
11298 echo "$as_me: error: Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}" >&2;} 11314 echo "$as_me: error: Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}" >&2;}
11299 { (exit 1); exit 1; }; }; 11315 { (exit 1); exit 1; }; };
11300 fi 11316 fi
11301 GLIB_REQUIRED=2.4 11317 GLIB_REQUIRED=2.6
11302 GTK_REQUIRED=2.4 11318 GTK_REQUIRED=2.6
11303 GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" 11319 GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED"
11304 11320
11305 if test "X${with_pkg_config_prog}" != X; then 11321 if test "X${with_pkg_config_prog}" != X; then
11306 PKG_CONFIG="${with_pkg_config_prog}" 11322 PKG_CONFIG="${with_pkg_config_prog}"
11307 fi 11323 fi
11636 cat >>confdefs.h <<\_ACEOF 11652 cat >>confdefs.h <<\_ACEOF
11637 #define HAVE_GTK_MULTIDISPLAY 1 11653 #define HAVE_GTK_MULTIDISPLAY 1
11638 _ACEOF 11654 _ACEOF
11639 11655
11640 fi 11656 fi
11657
11641 HAVE_GTK_FILE_SELECTION=no 11658 HAVE_GTK_FILE_SELECTION=no
11642 11659
11643 for ac_func in gtk_file_selection_new 11660 for ac_func in gtk_file_selection_new
11644 do 11661 do
11645 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` 11662 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
12047 HAVE_GTK_AND_PTHREAD=yes 12064 HAVE_GTK_AND_PTHREAD=yes
12048 fi 12065 fi
12049 12066
12050 fi 12067 fi
12051 if test "$HAVE_GTK_AND_PTHREAD" = yes; then 12068 if test "$HAVE_GTK_AND_PTHREAD" = yes; then
12052 GTK_LIBS="$GTK_LIBS -lpthread" 12069 case "${canonical}" in
12070 *-hpux*) ;;
12071 *) GTK_LIBS="$GTK_LIBS -lpthread" ;;
12072 esac
12053 12073
12054 cat >>confdefs.h <<\_ACEOF 12074 cat >>confdefs.h <<\_ACEOF
12055 #define HAVE_GTK_AND_PTHREAD 1 12075 #define HAVE_GTK_AND_PTHREAD 1
12056 _ACEOF 12076 _ACEOF
12057 12077
12062 HAVE_XAW3D=no 12082 HAVE_XAW3D=no
12063 if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then 12083 if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then
12064 if test x"${HAVE_X11R5}" != xyes; then 12084 if test x"${HAVE_X11R5}" != xyes; then
12065 USE_X_TOOLKIT=none 12085 USE_X_TOOLKIT=none
12066 else 12086 else
12067 { echo "$as_me:$LINENO: checking for xaw3d" >&5 12087 if test "$with_xaw3d" != no; then
12088 { echo "$as_me:$LINENO: checking for xaw3d" >&5
12068 echo $ECHO_N "checking for xaw3d... $ECHO_C" >&6; } 12089 echo $ECHO_N "checking for xaw3d... $ECHO_C" >&6; }
12069 if test "${emacs_cv_xaw3d+set}" = set; then 12090 if test "${emacs_cv_xaw3d+set}" = set; then
12070 echo $ECHO_N "(cached) $ECHO_C" >&6 12091 echo $ECHO_N "(cached) $ECHO_C" >&6
12071 else 12092 else
12072 cat >conftest.$ac_ext <<_ACEOF 12093 cat >conftest.$ac_ext <<_ACEOF
12073 /* confdefs.h. */ 12094 /* confdefs.h. */
12074 _ACEOF 12095 _ACEOF
12114 12135
12115 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ 12136 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
12116 conftest$ac_exeext conftest.$ac_ext 12137 conftest$ac_exeext conftest.$ac_ext
12117 fi 12138 fi
12118 12139
12140 else
12141 emacs_cv_xaw3d=no
12142 fi
12119 if test $emacs_cv_xaw3d = yes; then 12143 if test $emacs_cv_xaw3d = yes; then
12120 { echo "$as_me:$LINENO: result: yes; using Lucid toolkit" >&5 12144 { echo "$as_me:$LINENO: result: yes; using Lucid toolkit" >&5
12121 echo "${ECHO_T}yes; using Lucid toolkit" >&6; } 12145 echo "${ECHO_T}yes; using Lucid toolkit" >&6; }
12122 USE_X_TOOLKIT=LUCID 12146 USE_X_TOOLKIT=LUCID
12123 HAVE_XAW3D=yes 12147 HAVE_XAW3D=yes
15704 _ACEOF 15728 _ACEOF
15705 15729
15706 15730
15707 fi 15731 fi
15708 15732
15733
15734 if test x"$ac_cv_func_alloca_works" != xyes; then
15735 { { echo "$as_me:$LINENO: error: a system implementation of alloca is required " >&5
15736 echo "$as_me: error: a system implementation of alloca is required " >&2;}
15737 { (exit 1); exit 1; }; }
15738 fi
15709 15739
15710 # fmod, logb, and frexp are found in -lm on most systems. 15740 # fmod, logb, and frexp are found in -lm on most systems.
15711 # On HPUX 9.01, -lm does not contain logb, so check for sqrt. 15741 # On HPUX 9.01, -lm does not contain logb, so check for sqrt.
15712 15742
15713 { echo "$as_me:$LINENO: checking for sqrt in -lm" >&5 15743 { echo "$as_me:$LINENO: checking for sqrt in -lm" >&5
24142 CPP_NEED_TRADITIONAL=yes 24172 CPP_NEED_TRADITIONAL=yes
24143 fi 24173 fi
24144 rm -f conftest* 24174 rm -f conftest*
24145 24175
24146 24176
24147 ac_config_files="$ac_config_files Makefile lib-src/Makefile.c:lib-src/Makefile.in oldXMenu/Makefile man/Makefile lwlib/Makefile src/Makefile.c:src/Makefile.in lisp/Makefile lispref/Makefile lispintro/Makefile leim/Makefile" 24177 ac_config_files="$ac_config_files Makefile lib-src/Makefile.c:lib-src/Makefile.in oldXMenu/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile doc/lispref/Makefile src/Makefile.c:src/Makefile.in lwlib/Makefile lisp/Makefile leim/Makefile"
24148 24178
24149 ac_config_commands="$ac_config_commands default" 24179 ac_config_commands="$ac_config_commands default"
24150 24180
24151 cat >confcache <<\_ACEOF 24181 cat >confcache <<\_ACEOF
24152 # This file is a shell script that caches the results of configure 24182 # This file is a shell script that caches the results of configure
24712 case $ac_config_target in 24742 case $ac_config_target in
24713 "src/config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/config.h:src/config.in" ;; 24743 "src/config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/config.h:src/config.in" ;;
24714 "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; 24744 "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
24715 "lib-src/Makefile.c") CONFIG_FILES="$CONFIG_FILES lib-src/Makefile.c:lib-src/Makefile.in" ;; 24745 "lib-src/Makefile.c") CONFIG_FILES="$CONFIG_FILES lib-src/Makefile.c:lib-src/Makefile.in" ;;
24716 "oldXMenu/Makefile") CONFIG_FILES="$CONFIG_FILES oldXMenu/Makefile" ;; 24746 "oldXMenu/Makefile") CONFIG_FILES="$CONFIG_FILES oldXMenu/Makefile" ;;
24717 "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; 24747 "doc/emacs/Makefile") CONFIG_FILES="$CONFIG_FILES doc/emacs/Makefile" ;;
24748 "doc/misc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/misc/Makefile" ;;
24749 "doc/lispintro/Makefile") CONFIG_FILES="$CONFIG_FILES doc/lispintro/Makefile" ;;
24750 "doc/lispref/Makefile") CONFIG_FILES="$CONFIG_FILES doc/lispref/Makefile" ;;
24751 "src/Makefile.c") CONFIG_FILES="$CONFIG_FILES src/Makefile.c:src/Makefile.in" ;;
24718 "lwlib/Makefile") CONFIG_FILES="$CONFIG_FILES lwlib/Makefile" ;; 24752 "lwlib/Makefile") CONFIG_FILES="$CONFIG_FILES lwlib/Makefile" ;;
24719 "src/Makefile.c") CONFIG_FILES="$CONFIG_FILES src/Makefile.c:src/Makefile.in" ;;
24720 "lisp/Makefile") CONFIG_FILES="$CONFIG_FILES lisp/Makefile" ;; 24753 "lisp/Makefile") CONFIG_FILES="$CONFIG_FILES lisp/Makefile" ;;
24721 "lispref/Makefile") CONFIG_FILES="$CONFIG_FILES lispref/Makefile" ;;
24722 "lispintro/Makefile") CONFIG_FILES="$CONFIG_FILES lispintro/Makefile" ;;
24723 "leim/Makefile") CONFIG_FILES="$CONFIG_FILES leim/Makefile" ;; 24754 "leim/Makefile") CONFIG_FILES="$CONFIG_FILES leim/Makefile" ;;
24724 "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; 24755 "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
24725 24756
24726 *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 24757 *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
24727 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} 24758 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}