Mercurial > emacs
comparison configure @ 90428:a8190f7e546e
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 285-296)
- Update from CVS
- Merge from gnus--rel--5.10
- Update from CVS: admin/FOR-RELEASE: Update refcard section.
* gnus--rel--5.10 (patch 102-104)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-64
author | Miles Bader <miles@gnu.org> |
---|---|
date | Wed, 07 Jun 2006 18:05:10 +0000 |
parents | f998539f09a9 e5cd81bde625 |
children | 8a8e69664178 |
comparison
equal
deleted
inserted
replaced
90427:ddb25860d044 | 90428:a8190f7e546e |
---|---|
308 #endif | 308 #endif |
309 #if HAVE_UNISTD_H | 309 #if HAVE_UNISTD_H |
310 # include <unistd.h> | 310 # include <unistd.h> |
311 #endif" | 311 #endif" |
312 | 312 |
313 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP LN_S INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB INSTALL_INFO GZIP_PROG LIBSOUND SET_MAKE PKG_CONFIG GTK_CFLAGS GTK_LIBS XFT_CFLAGS XFT_LIBS FREETYPE_CFLAGS FREETYPE_LIBS FONTCONFIG_CFLAGS FONTCONFIG_LIBS HAVE_LIBOTF LIBOTF_CFLAGS LIBOTF_LIBS ALLOCA liblockfile LIBOBJS NEED_SETGID KMEM_GROUP GETLOADAVG_LIBS GETOPT_H GETOPTOBJS version configuration canonical srcdir lispdir locallisppath lisppath x_default_search_path etcdir archlibdir docdir bitmapdir gamedir gameuser c_switch_system c_switch_machine LD_SWITCH_X_SITE LD_SWITCH_X_SITE_AUX C_SWITCH_X_SITE X_TOOLKIT_TYPE machfile opsysfile carbon_appdir LTLIBOBJS' | 313 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP LN_S INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB INSTALL_INFO GZIP_PROG LIBSOUND PKG_CONFIG ALSA_CFLAGS ALSA_LIBS CFLAGS_SOUND SET_MAKE GTK_CFLAGS GTK_LIBS XFT_CFLAGS XFT_LIBS FREETYPE_CFLAGS FREETYPE_LIBS FONTCONFIG_CFLAGS FONTCONFIG_LIBS HAVE_LIBOTF LIBOTF_CFLAGS LIBOTF_LIBS ALLOCA liblockfile LIBOBJS NEED_SETGID KMEM_GROUP GETLOADAVG_LIBS GETOPT_H GETOPTOBJS version configuration canonical srcdir lispdir locallisppath lisppath x_default_search_path etcdir archlibdir docdir bitmapdir gamedir gameuser c_switch_system c_switch_machine LD_SWITCH_X_SITE LD_SWITCH_X_SITE_AUX C_SWITCH_X_SITE X_TOOLKIT_TYPE machfile opsysfile carbon_appdir LTLIBOBJS' |
314 ac_subst_files='' | 314 ac_subst_files='' |
315 | 315 |
316 # Initialize some variables set by options. | 316 # Initialize some variables set by options. |
317 ac_init_help= | 317 ac_init_help= |
318 ac_init_version=false | 318 ac_init_version=false |
5186 fi | 5186 fi |
5187 rm -f conftest* | 5187 rm -f conftest* |
5188 fi | 5188 fi |
5189 | 5189 |
5190 | 5190 |
5191 | |
5192 | |
5193 | |
5194 | |
5191 if test "${with_sound}" != "no"; then | 5195 if test "${with_sound}" != "no"; then |
5192 # Sound support for GNU/Linux and the free BSDs. | 5196 # Sound support for GNU/Linux and the free BSDs. |
5193 echo "$as_me:$LINENO: checking for ANSI C header files" >&5 | 5197 echo "$as_me:$LINENO: checking for ANSI C header files" >&5 |
5194 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 | 5198 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 |
5195 if test "${ac_cv_header_stdc+set}" = set; then | 5199 if test "${ac_cv_header_stdc+set}" = set; then |
5650 else | 5654 else |
5651 LIBSOUND= | 5655 LIBSOUND= |
5652 fi | 5656 fi |
5653 | 5657 |
5654 | 5658 |
5659 | |
5660 ALSA_REQUIRED=1.0.0 | |
5661 ALSA_MODULES="alsa >= $ALSA_REQUIRED" | |
5662 if test "X${with_pkg_config_prog}" != X; then | |
5663 PKG_CONFIG="${with_pkg_config_prog}" | |
5664 fi | |
5665 | |
5666 succeeded=no | |
5667 | |
5668 if test -z "$PKG_CONFIG"; then | |
5669 # Extract the first word of "pkg-config", so it can be a program name with args. | |
5670 set dummy pkg-config; ac_word=$2 | |
5671 echo "$as_me:$LINENO: checking for $ac_word" >&5 | |
5672 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 | |
5673 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then | |
5674 echo $ECHO_N "(cached) $ECHO_C" >&6 | |
5675 else | |
5676 case $PKG_CONFIG in | |
5677 [\\/]* | ?:[\\/]*) | |
5678 ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. | |
5679 ;; | |
5680 *) | |
5681 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | |
5682 for as_dir in $PATH | |
5683 do | |
5684 IFS=$as_save_IFS | |
5685 test -z "$as_dir" && as_dir=. | |
5686 for ac_exec_ext in '' $ac_executable_extensions; do | |
5687 if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | |
5688 ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" | |
5689 echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
5690 break 2 | |
5691 fi | |
5692 done | |
5693 done | |
5694 | |
5695 test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" | |
5696 ;; | |
5697 esac | |
5698 fi | |
5699 PKG_CONFIG=$ac_cv_path_PKG_CONFIG | |
5700 | |
5701 if test -n "$PKG_CONFIG"; then | |
5702 echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 | |
5703 echo "${ECHO_T}$PKG_CONFIG" >&6 | |
5704 else | |
5705 echo "$as_me:$LINENO: result: no" >&5 | |
5706 echo "${ECHO_T}no" >&6 | |
5707 fi | |
5708 | |
5709 fi | |
5710 | |
5711 if test "$PKG_CONFIG" = "no" ; then | |
5712 HAVE_ALSA=no | |
5713 else | |
5714 PKG_CONFIG_MIN_VERSION=0.9.0 | |
5715 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | |
5716 echo "$as_me:$LINENO: checking for $ALSA_MODULES" >&5 | |
5717 echo $ECHO_N "checking for $ALSA_MODULES... $ECHO_C" >&6 | |
5718 | |
5719 if $PKG_CONFIG --exists "$ALSA_MODULES" ; then | |
5720 echo "$as_me:$LINENO: result: yes" >&5 | |
5721 echo "${ECHO_T}yes" >&6 | |
5722 succeeded=yes | |
5723 | |
5724 echo "$as_me:$LINENO: checking ALSA_CFLAGS" >&5 | |
5725 echo $ECHO_N "checking ALSA_CFLAGS... $ECHO_C" >&6 | |
5726 ALSA_CFLAGS=`$PKG_CONFIG --cflags "$ALSA_MODULES"` | |
5727 echo "$as_me:$LINENO: result: $ALSA_CFLAGS" >&5 | |
5728 echo "${ECHO_T}$ALSA_CFLAGS" >&6 | |
5729 | |
5730 echo "$as_me:$LINENO: checking ALSA_LIBS" >&5 | |
5731 echo $ECHO_N "checking ALSA_LIBS... $ECHO_C" >&6 | |
5732 ALSA_LIBS=`$PKG_CONFIG --libs "$ALSA_MODULES"` | |
5733 echo "$as_me:$LINENO: result: $ALSA_LIBS" >&5 | |
5734 echo "${ECHO_T}$ALSA_LIBS" >&6 | |
5735 else | |
5736 echo "$as_me:$LINENO: result: no" >&5 | |
5737 echo "${ECHO_T}no" >&6 | |
5738 ALSA_CFLAGS="" | |
5739 ALSA_LIBS="" | |
5740 ## If we have a custom action on failure, don't print errors, but | |
5741 ## do set a variable so people can do so. | |
5742 ALSA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$ALSA_MODULES"` | |
5743 | |
5744 fi | |
5745 | |
5746 | |
5747 | |
5748 else | |
5749 echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." | |
5750 echo "*** See http://www.freedesktop.org/software/pkgconfig" | |
5751 fi | |
5752 fi | |
5753 | |
5754 if test $succeeded = yes; then | |
5755 HAVE_ALSA=yes | |
5756 else | |
5757 HAVE_ALSA=no | |
5758 fi | |
5759 | |
5760 if test $HAVE_ALSA = yes; then | |
5761 LIBSOUND="$LIBSOUND $ALSA_LIBS" | |
5762 CFLAGS_SOUND="$CFLAGS_SOUND $ALSA_CFLAGS" | |
5763 | |
5764 cat >>confdefs.h <<\_ACEOF | |
5765 #define HAVE_ALSA 1 | |
5766 _ACEOF | |
5767 | |
5768 fi | |
5769 | |
5655 fi | 5770 fi |
5656 | 5771 |
5657 | 5772 |
5658 | 5773 |
5659 | 5774 |
10216 echo "$as_me:$LINENO: result: before 5" >&5 | 10331 echo "$as_me:$LINENO: result: before 5" >&5 |
10217 echo "${ECHO_T}before 5" >&6 | 10332 echo "${ECHO_T}before 5" >&6 |
10218 fi | 10333 fi |
10219 fi | 10334 fi |
10220 | 10335 |
10221 | |
10222 | |
10223 HAVE_GTK=no | 10336 HAVE_GTK=no |
10224 if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk"; then | 10337 if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk"; then |
10225 if test "$USE_X_TOOLKIT" != "none" && test "$USE_X_TOOLKIT" != "maybe"; then | 10338 if test "$USE_X_TOOLKIT" != "none" && test "$USE_X_TOOLKIT" != "maybe"; then |
10226 { { echo "$as_me:$LINENO: error: Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}" >&5 | 10339 { { echo "$as_me:$LINENO: error: Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}" >&5 |
10227 echo "$as_me: error: Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}" >&2;} | 10340 echo "$as_me: error: Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}" >&2;} |
10279 fi | 10392 fi |
10280 | 10393 |
10281 fi | 10394 fi |
10282 | 10395 |
10283 if test "$PKG_CONFIG" = "no" ; then | 10396 if test "$PKG_CONFIG" = "no" ; then |
10284 echo "*** The pkg-config script could not be found. Make sure it is" | 10397 { { echo "$as_me:$LINENO: error: |
10285 echo "*** in your path, or give the full path to pkg-config with" | 10398 *** The pkg-config script could not be found. Make sure it is in your path, or give the full path to pkg-config with the PKG_CONFIG environment variable or --with-pkg-config-prog. Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." >&5 |
10286 echo "*** the PKG_CONFIG environment variable or --with-pkg-config-prog." | 10399 echo "$as_me: error: |
10287 echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." | 10400 *** The pkg-config script could not be found. Make sure it is in your path, or give the full path to pkg-config with the PKG_CONFIG environment variable or --with-pkg-config-prog. Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." >&2;} |
10401 { (exit 1); exit 1; }; } | |
10288 else | 10402 else |
10289 PKG_CONFIG_MIN_VERSION=0.9.0 | 10403 PKG_CONFIG_MIN_VERSION=0.9.0 |
10290 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then | 10404 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then |
10291 echo "$as_me:$LINENO: checking for $GTK_MODULES" >&5 | 10405 echo "$as_me:$LINENO: checking for $GTK_MODULES" >&5 |
10292 echo $ECHO_N "checking for $GTK_MODULES... $ECHO_C" >&6 | 10406 echo $ECHO_N "checking for $GTK_MODULES... $ECHO_C" >&6 |
10306 echo $ECHO_N "checking GTK_LIBS... $ECHO_C" >&6 | 10420 echo $ECHO_N "checking GTK_LIBS... $ECHO_C" >&6 |
10307 GTK_LIBS=`$PKG_CONFIG --libs "$GTK_MODULES"` | 10421 GTK_LIBS=`$PKG_CONFIG --libs "$GTK_MODULES"` |
10308 echo "$as_me:$LINENO: result: $GTK_LIBS" >&5 | 10422 echo "$as_me:$LINENO: result: $GTK_LIBS" >&5 |
10309 echo "${ECHO_T}$GTK_LIBS" >&6 | 10423 echo "${ECHO_T}$GTK_LIBS" >&6 |
10310 else | 10424 else |
10425 echo "$as_me:$LINENO: result: no" >&5 | |
10426 echo "${ECHO_T}no" >&6 | |
10311 GTK_CFLAGS="" | 10427 GTK_CFLAGS="" |
10312 GTK_LIBS="" | 10428 GTK_LIBS="" |
10313 ## If we have a custom action on failure, don't print errors, but | 10429 ## If we have a custom action on failure, don't print errors, but |
10314 ## do set a variable so people can do so. | 10430 ## do set a variable so people can do so. |
10315 GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$GTK_MODULES"` | 10431 GTK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$GTK_MODULES"` |
24293 s,@RANLIB@,$RANLIB,;t t | 24409 s,@RANLIB@,$RANLIB,;t t |
24294 s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t | 24410 s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t |
24295 s,@INSTALL_INFO@,$INSTALL_INFO,;t t | 24411 s,@INSTALL_INFO@,$INSTALL_INFO,;t t |
24296 s,@GZIP_PROG@,$GZIP_PROG,;t t | 24412 s,@GZIP_PROG@,$GZIP_PROG,;t t |
24297 s,@LIBSOUND@,$LIBSOUND,;t t | 24413 s,@LIBSOUND@,$LIBSOUND,;t t |
24414 s,@PKG_CONFIG@,$PKG_CONFIG,;t t | |
24415 s,@ALSA_CFLAGS@,$ALSA_CFLAGS,;t t | |
24416 s,@ALSA_LIBS@,$ALSA_LIBS,;t t | |
24417 s,@CFLAGS_SOUND@,$CFLAGS_SOUND,;t t | |
24298 s,@SET_MAKE@,$SET_MAKE,;t t | 24418 s,@SET_MAKE@,$SET_MAKE,;t t |
24299 s,@PKG_CONFIG@,$PKG_CONFIG,;t t | |
24300 s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t | 24419 s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t |
24301 s,@GTK_LIBS@,$GTK_LIBS,;t t | 24420 s,@GTK_LIBS@,$GTK_LIBS,;t t |
24302 s,@XFT_CFLAGS@,$XFT_CFLAGS,;t t | 24421 s,@XFT_CFLAGS@,$XFT_CFLAGS,;t t |
24303 s,@XFT_LIBS@,$XFT_LIBS,;t t | 24422 s,@XFT_LIBS@,$XFT_LIBS,;t t |
24304 s,@FREETYPE_CFLAGS@,$FREETYPE_CFLAGS,;t t | 24423 s,@FREETYPE_CFLAGS@,$FREETYPE_CFLAGS,;t t |