comparison configure @ 91015:b83d0dadb2a7

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 857-865) - Update from CVS - Merge from emacs--rel--22 - Update from CVS: lisp/emacs-lisp/avl-tree.el: New file. - Remove RCS keywords * emacs--rel--22 (patch 97-100) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 246-247) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-252
author Miles Bader <miles@gnu.org>
date Wed, 29 Aug 2007 05:03:40 +0000
parents a37d5bf6cbb7 e284140aa5be
children 14c4a6aac623
comparison
equal deleted inserted replaced
91014:2392e6a45952 91015:b83d0dadb2a7
677 INSTALL_SCRIPT 677 INSTALL_SCRIPT
678 INSTALL_DATA 678 INSTALL_DATA
679 RANLIB 679 RANLIB
680 INSTALL_INFO 680 INSTALL_INFO
681 GZIP_PROG 681 GZIP_PROG
682 MAKEINFO
682 LIBSOUND 683 LIBSOUND
683 PKG_CONFIG 684 PKG_CONFIG
684 ALSA_CFLAGS 685 ALSA_CFLAGS
685 ALSA_LIBS 686 ALSA_LIBS
686 CFLAGS_SOUND 687 CFLAGS_SOUND
687 SET_MAKE 688 SET_MAKE
688 XMKMF 689 XMKMF
689 HAVE_XSERVER 690 HAVE_XSERVER
691 RSVG_CFLAGS
692 RSVG_LIBS
690 GTK_CFLAGS 693 GTK_CFLAGS
691 GTK_LIBS 694 GTK_LIBS
692 XFT_CFLAGS 695 XFT_CFLAGS
693 XFT_LIBS 696 XFT_LIBS
694 FREETYPE_CFLAGS 697 FREETYPE_CFLAGS
1349 --with-gif use -lgif (or -lungif) for displaying GIF images 1352 --with-gif use -lgif (or -lungif) for displaying GIF images
1350 --with-png use -lpng for displaying PNG images 1353 --with-png use -lpng for displaying PNG images
1351 --with-freetype use -lfreetype for local fonts support 1354 --with-freetype use -lfreetype for local fonts support
1352 --with-xft use -lXft for anti aliased fonts 1355 --with-xft use -lXft for anti aliased fonts
1353 --with-gpm use -lgpm for mouse support on a GNU/Linux console 1356 --with-gpm use -lgpm for mouse support on a GNU/Linux console
1357 --with-rsvg use -lrsvg-2 for displaying SVG images
1354 --with-gtk use GTK (same as --with-x-toolkit=gtk) 1358 --with-gtk use GTK (same as --with-x-toolkit=gtk)
1355 --with-pkg-config-prog Path to pkg-config to use for finding GTK 1359 --with-pkg-config-prog Path to pkg-config to use for finding GTK and librsvg
1356 --without-toolkit-scroll-bars 1360 --without-toolkit-scroll-bars
1357 don't use Motif or Xaw3d scroll bars 1361 don't use Motif or Xaw3d scroll bars
1358 --without-xim don't use X11 XIM 1362 --without-xim don't use X11 XIM
1359 --without-carbon don't use Carbon GUI on Mac OS X 1363 --without-carbon don't use Carbon GUI on Mac OS X
1360 --with-x use the X Window System 1364 --with-x use the X Window System
1966 1970
1967 1971
1968 # Check whether --with-gpm was given. 1972 # Check whether --with-gpm was given.
1969 if test "${with_gpm+set}" = set; then 1973 if test "${with_gpm+set}" = set; then
1970 withval=$with_gpm; 1974 withval=$with_gpm;
1975 fi
1976
1977
1978 # Check whether --with-rsvg was given.
1979 if test "${with_rsvg+set}" = set; then
1980 withval=$with_rsvg;
1971 fi 1981 fi
1972 1982
1973 1983
1974 # Check whether --with-gtk was given. 1984 # Check whether --with-gtk was given.
1975 if test "${with_gtk+set}" = set; then 1985 if test "${with_gtk+set}" = set; then
5349 fi 5359 fi
5350 5360
5351 5361
5352 5362
5353 5363
5364 ## Need makeinfo >= 4.6 (?) to build the manuals.
5365 # Extract the first word of "makeinfo", so it can be a program name with args.
5366 set dummy makeinfo; ac_word=$2
5367 { echo "$as_me:$LINENO: checking for $ac_word" >&5
5368 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
5369 if test "${ac_cv_path_MAKEINFO+set}" = set; then
5370 echo $ECHO_N "(cached) $ECHO_C" >&6
5371 else
5372 case $MAKEINFO in
5373 [\\/]* | ?:[\\/]*)
5374 ac_cv_path_MAKEINFO="$MAKEINFO" # Let the user override the test with a path.
5375 ;;
5376 *)
5377 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5378 for as_dir in $PATH
5379 do
5380 IFS=$as_save_IFS
5381 test -z "$as_dir" && as_dir=.
5382 for ac_exec_ext in '' $ac_executable_extensions; do
5383 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
5384 ac_cv_path_MAKEINFO="$as_dir/$ac_word$ac_exec_ext"
5385 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
5386 break 2
5387 fi
5388 done
5389 done
5390 IFS=$as_save_IFS
5391
5392 test -z "$ac_cv_path_MAKEINFO" && ac_cv_path_MAKEINFO="no"
5393 ;;
5394 esac
5395 fi
5396 MAKEINFO=$ac_cv_path_MAKEINFO
5397 if test -n "$MAKEINFO"; then
5398 { echo "$as_me:$LINENO: result: $MAKEINFO" >&5
5399 echo "${ECHO_T}$MAKEINFO" >&6; }
5400 else
5401 { echo "$as_me:$LINENO: result: no" >&5
5402 echo "${ECHO_T}no" >&6; }
5403 fi
5404
5405
5406 if test "$MAKEINFO" != "no" && \
5407 test x"`$MAKEINFO --version 2> /dev/null | $EGREP 'texinfo[^0-9]*([5-9]|4\.[6-9])'`" = x; then
5408 MAKEINFO=no
5409 fi
5410
5411 if test "$MAKEINFO" = "no"; then
5412 { { echo "$as_me:$LINENO: error: makeinfo >= 4.6 is required " >&5
5413 echo "$as_me: error: makeinfo >= 4.6 is required " >&2;}
5414 { (exit 1); exit 1; }; }
5415 fi
5416
5417
5418
5354 if test x$GCC = xyes && test "x$GCC_LINK_TEST_OPTIONS" != x 5419 if test x$GCC = xyes && test "x$GCC_LINK_TEST_OPTIONS" != x
5355 then 5420 then
5356 ac_link="$ac_link $GCC_LINK_TEST_OPTIONS" 5421 ac_link="$ac_link $GCC_LINK_TEST_OPTIONS"
5357 fi 5422 fi
5358 5423
11096 { echo "$as_me:$LINENO: result: before 5" >&5 11161 { echo "$as_me:$LINENO: result: before 5" >&5
11097 echo "${ECHO_T}before 5" >&6; } 11162 echo "${ECHO_T}before 5" >&6; }
11098 fi 11163 fi
11099 fi 11164 fi
11100 11165
11166 ### Use -lrsvg-2 if available, unless `--with-rsvg=no' is specified.
11167 HAVE_RSVG=no
11168 if test "${HAVE_X11}" = "yes" || test "${HAVE_CARBON}" = "yes"; then
11169 if test "${with_rsvg}" != "no"; then
11170 if test "X${with_pkg_config_prog}" != X; then
11171 PKG_CONFIG="${with_pkg_config_prog}"
11172 fi
11173
11174 RSVG_REQUIRED=2.0.0
11175 RSVG_MODULE="librsvg-2.0 >= $RSVG_REQUIRED"
11176
11177
11178 succeeded=no
11179
11180 if test -z "$PKG_CONFIG"; then
11181 # Extract the first word of "pkg-config", so it can be a program name with args.
11182 set dummy pkg-config; ac_word=$2
11183 { echo "$as_me:$LINENO: checking for $ac_word" >&5
11184 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
11185 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
11186 echo $ECHO_N "(cached) $ECHO_C" >&6
11187 else
11188 case $PKG_CONFIG in
11189 [\\/]* | ?:[\\/]*)
11190 ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
11191 ;;
11192 *)
11193 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
11194 for as_dir in $PATH
11195 do
11196 IFS=$as_save_IFS
11197 test -z "$as_dir" && as_dir=.
11198 for ac_exec_ext in '' $ac_executable_extensions; do
11199 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
11200 ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
11201 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
11202 break 2
11203 fi
11204 done
11205 done
11206 IFS=$as_save_IFS
11207
11208 test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
11209 ;;
11210 esac
11211 fi
11212 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
11213 if test -n "$PKG_CONFIG"; then
11214 { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
11215 echo "${ECHO_T}$PKG_CONFIG" >&6; }
11216 else
11217 { echo "$as_me:$LINENO: result: no" >&5
11218 echo "${ECHO_T}no" >&6; }
11219 fi
11220
11221
11222 fi
11223
11224 if test "$PKG_CONFIG" = "no" ; then
11225 :
11226 else
11227 PKG_CONFIG_MIN_VERSION=0.9.0
11228 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
11229 { echo "$as_me:$LINENO: checking for $RSVG_MODULE" >&5
11230 echo $ECHO_N "checking for $RSVG_MODULE... $ECHO_C" >&6; }
11231
11232 if $PKG_CONFIG --exists "$RSVG_MODULE" 2>&5; then
11233 { echo "$as_me:$LINENO: result: yes" >&5
11234 echo "${ECHO_T}yes" >&6; }
11235 succeeded=yes
11236
11237 { echo "$as_me:$LINENO: checking RSVG_CFLAGS" >&5
11238 echo $ECHO_N "checking RSVG_CFLAGS... $ECHO_C" >&6; }
11239 RSVG_CFLAGS=`$PKG_CONFIG --cflags "$RSVG_MODULE"|sed -e 's,///*,/,g'`
11240 { echo "$as_me:$LINENO: result: $RSVG_CFLAGS" >&5
11241 echo "${ECHO_T}$RSVG_CFLAGS" >&6; }
11242
11243 { echo "$as_me:$LINENO: checking RSVG_LIBS" >&5
11244 echo $ECHO_N "checking RSVG_LIBS... $ECHO_C" >&6; }
11245 RSVG_LIBS=`$PKG_CONFIG --libs "$RSVG_MODULE"|sed -e 's,///*,/,g'`
11246 { echo "$as_me:$LINENO: result: $RSVG_LIBS" >&5
11247 echo "${ECHO_T}$RSVG_LIBS" >&6; }
11248 else
11249 { echo "$as_me:$LINENO: result: no" >&5
11250 echo "${ECHO_T}no" >&6; }
11251 RSVG_CFLAGS=""
11252 RSVG_LIBS=""
11253 ## If we have a custom action on failure, don't print errors, but
11254 ## do set a variable so people can do so.
11255 RSVG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$RSVG_MODULE"`
11256
11257 fi
11258
11259
11260
11261 else
11262 echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
11263 echo "*** See http://www.freedesktop.org/software/pkgconfig"
11264 fi
11265 fi
11266
11267 if test $succeeded = yes; then
11268 :
11269 else
11270 :
11271 fi
11272
11273
11274
11275
11276 if test ".${RSVG_CFLAGS}" != "."; then
11277 HAVE_RSVG=yes
11278
11279 cat >>confdefs.h <<\_ACEOF
11280 #define HAVE_RSVG 1
11281 _ACEOF
11282
11283 CFLAGS="$CFLAGS $RSVG_CFLAGS"
11284 LIBS="$RSVG_LIBS $LIBS"
11285 fi
11286 fi
11287 fi
11288
11289
11101 HAVE_GTK=no 11290 HAVE_GTK=no
11102 if test "${with_gtk}" = "yes" && test "$USE_X_TOOLKIT" = "gtk"; then 11291 if test "${with_gtk}" = "yes" && test "$USE_X_TOOLKIT" = "gtk"; then
11103 USE_X_TOOLKIT=none 11292 USE_X_TOOLKIT=none
11104 fi 11293 fi
11105 if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk" || \ 11294 if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk" || \
14508 MISSING="$MISSING libgif/libungif" && WITH_NO="$WITH_NO --with-gif=no" 14697 MISSING="$MISSING libgif/libungif" && WITH_NO="$WITH_NO --with-gif=no"
14509 test "${with_tiff}" != "no" && test "${HAVE_TIFF}" != "yes" && 14698 test "${with_tiff}" != "no" && test "${HAVE_TIFF}" != "yes" &&
14510 MISSING="$MISSING libtiff" && WITH_NO="$WITH_NO --with-tiff=no" 14699 MISSING="$MISSING libtiff" && WITH_NO="$WITH_NO --with-tiff=no"
14511 14700
14512 if test "X${MISSING}" != X; then 14701 if test "X${MISSING}" != X; then
14513 { { echo "$as_me:$LINENO: error: The following required libraries was not found: 14702 { { echo "$as_me:$LINENO: error: The following required libraries were not found:
14514 $MISSING 14703 $MISSING
14515 Maybe some development libraries/packages are missing? 14704 Maybe some development libraries/packages are missing?
14516 If you don't want to link with them give 14705 If you don't want to link with them give
14517 $WITH_NO 14706 $WITH_NO
14518 as options to configure" >&5 14707 as options to configure" >&5
14519 echo "$as_me: error: The following required libraries was not found: 14708 echo "$as_me: error: The following required libraries were not found:
14520 $MISSING 14709 $MISSING
14521 Maybe some development libraries/packages are missing? 14710 Maybe some development libraries/packages are missing?
14522 If you don't want to link with them give 14711 If you don't want to link with them give
14523 $WITH_NO 14712 $WITH_NO
14524 as options to configure" >&2;} 14713 as options to configure" >&2;}
23902 echo " Does Emacs use -lXpm? ${HAVE_XPM}" 24091 echo " Does Emacs use -lXpm? ${HAVE_XPM}"
23903 echo " Does Emacs use -ljpeg? ${HAVE_JPEG}" 24092 echo " Does Emacs use -ljpeg? ${HAVE_JPEG}"
23904 echo " Does Emacs use -ltiff? ${HAVE_TIFF}" 24093 echo " Does Emacs use -ltiff? ${HAVE_TIFF}"
23905 echo " Does Emacs use a gif library? ${HAVE_GIF} $ac_gif_lib_name" 24094 echo " Does Emacs use a gif library? ${HAVE_GIF} $ac_gif_lib_name"
23906 echo " Does Emacs use -lpng? ${HAVE_PNG}" 24095 echo " Does Emacs use -lpng? ${HAVE_PNG}"
24096 echo " Does Emacs use -lrsvg-2? ${HAVE_RSVG}"
23907 echo " Does Emacs use -lgpm? ${HAVE_GPM}" 24097 echo " Does Emacs use -lgpm? ${HAVE_GPM}"
23908 echo " Does Emacs use X toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}" 24098 echo " Does Emacs use X toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}"
23909 echo 24099 echo
23910 24100
23911 if test $USE_XASSERTS = yes; then 24101 if test $USE_XASSERTS = yes; then
24655 INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim 24845 INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
24656 INSTALL_DATA!$INSTALL_DATA$ac_delim 24846 INSTALL_DATA!$INSTALL_DATA$ac_delim
24657 RANLIB!$RANLIB$ac_delim 24847 RANLIB!$RANLIB$ac_delim
24658 INSTALL_INFO!$INSTALL_INFO$ac_delim 24848 INSTALL_INFO!$INSTALL_INFO$ac_delim
24659 GZIP_PROG!$GZIP_PROG$ac_delim 24849 GZIP_PROG!$GZIP_PROG$ac_delim
24850 MAKEINFO!$MAKEINFO$ac_delim
24660 LIBSOUND!$LIBSOUND$ac_delim 24851 LIBSOUND!$LIBSOUND$ac_delim
24661 PKG_CONFIG!$PKG_CONFIG$ac_delim 24852 PKG_CONFIG!$PKG_CONFIG$ac_delim
24662 ALSA_CFLAGS!$ALSA_CFLAGS$ac_delim 24853 ALSA_CFLAGS!$ALSA_CFLAGS$ac_delim
24663 ALSA_LIBS!$ALSA_LIBS$ac_delim 24854 ALSA_LIBS!$ALSA_LIBS$ac_delim
24664 CFLAGS_SOUND!$CFLAGS_SOUND$ac_delim 24855 CFLAGS_SOUND!$CFLAGS_SOUND$ac_delim
24665 SET_MAKE!$SET_MAKE$ac_delim 24856 SET_MAKE!$SET_MAKE$ac_delim
24666 XMKMF!$XMKMF$ac_delim 24857 XMKMF!$XMKMF$ac_delim
24667 HAVE_XSERVER!$HAVE_XSERVER$ac_delim 24858 HAVE_XSERVER!$HAVE_XSERVER$ac_delim
24859 RSVG_CFLAGS!$RSVG_CFLAGS$ac_delim
24860 RSVG_LIBS!$RSVG_LIBS$ac_delim
24668 GTK_CFLAGS!$GTK_CFLAGS$ac_delim 24861 GTK_CFLAGS!$GTK_CFLAGS$ac_delim
24669 GTK_LIBS!$GTK_LIBS$ac_delim 24862 GTK_LIBS!$GTK_LIBS$ac_delim
24670 XFT_CFLAGS!$XFT_CFLAGS$ac_delim 24863 XFT_CFLAGS!$XFT_CFLAGS$ac_delim
24671 XFT_LIBS!$XFT_LIBS$ac_delim 24864 XFT_LIBS!$XFT_LIBS$ac_delim
24672 FREETYPE_CFLAGS!$FREETYPE_CFLAGS$ac_delim 24865 FREETYPE_CFLAGS!$FREETYPE_CFLAGS$ac_delim
24686 GETOPTOBJS!$GETOPTOBJS$ac_delim 24879 GETOPTOBJS!$GETOPTOBJS$ac_delim
24687 version!$version$ac_delim 24880 version!$version$ac_delim
24688 configuration!$configuration$ac_delim 24881 configuration!$configuration$ac_delim
24689 canonical!$canonical$ac_delim 24882 canonical!$canonical$ac_delim
24690 srcdir!$srcdir$ac_delim 24883 srcdir!$srcdir$ac_delim
24691 lispdir!$lispdir$ac_delim
24692 locallisppath!$locallisppath$ac_delim
24693 lisppath!$lisppath$ac_delim
24694 _ACEOF 24884 _ACEOF
24695 24885
24696 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then 24886 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
24697 break 24887 break
24698 elif $ac_last_try; then 24888 elif $ac_last_try; then
24730 24920
24731 24921
24732 ac_delim='%!_!# ' 24922 ac_delim='%!_!# '
24733 for ac_last_try in false false false false false :; do 24923 for ac_last_try in false false false false false :; do
24734 cat >conf$$subs.sed <<_ACEOF 24924 cat >conf$$subs.sed <<_ACEOF
24925 lispdir!$lispdir$ac_delim
24926 locallisppath!$locallisppath$ac_delim
24927 lisppath!$lisppath$ac_delim
24735 x_default_search_path!$x_default_search_path$ac_delim 24928 x_default_search_path!$x_default_search_path$ac_delim
24736 etcdir!$etcdir$ac_delim 24929 etcdir!$etcdir$ac_delim
24737 archlibdir!$archlibdir$ac_delim 24930 archlibdir!$archlibdir$ac_delim
24738 bitmapdir!$bitmapdir$ac_delim 24931 bitmapdir!$bitmapdir$ac_delim
24739 gamedir!$gamedir$ac_delim 24932 gamedir!$gamedir$ac_delim
24748 opsysfile!$opsysfile$ac_delim 24941 opsysfile!$opsysfile$ac_delim
24749 carbon_appdir!$carbon_appdir$ac_delim 24942 carbon_appdir!$carbon_appdir$ac_delim
24750 LTLIBOBJS!$LTLIBOBJS$ac_delim 24943 LTLIBOBJS!$LTLIBOBJS$ac_delim
24751 _ACEOF 24944 _ACEOF
24752 24945
24753 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 16; then 24946 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 19; then
24754 break 24947 break
24755 elif $ac_last_try; then 24948 elif $ac_last_try; then
24756 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 24949 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
24757 echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} 24950 echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
24758 { (exit 1); exit 1; }; } 24951 { (exit 1); exit 1; }; }