emacs: configure comparison

comparison configure @ 91204:53108e6cea98

Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-294

author	Miles Bader <miles@gnu.org>
date	Thu, 06 Dec 2007 09:51:45 +0000
parents	293155ed2cf4 038ec9c21c41
children	2fcaae6177a5

comparison

equal deleted inserted replaced

-:db40129142b2
+:53108e6cea98
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61.
+# Generated by GNU Autoconf 2.61 for emacs 23.0.50.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 MFLAGS=
 MAKEFLAGS=
 SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
-PACKAGE_NAME=
+PACKAGE_NAME='emacs'
-PACKAGE_TARNAME=
+PACKAGE_TARNAME='emacs'
-PACKAGE_VERSION=
+PACKAGE_VERSION='23.0.50'
-PACKAGE_STRING=
+PACKAGE_STRING='emacs 23.0.50'
-PACKAGE_BUGREPORT=
+PACKAGE_BUGREPORT=''
 ac_unique_file="src/lisp.h"
 ac_config_libobj_dir=src
 # Factoring default headers for most tests.
 ac_includes_default="\
 HAVE_XSERVER
 RSVG_CFLAGS
 RSVG_LIBS
 GTK_CFLAGS
 GTK_LIBS
+DBUS_CFLAGS
+DBUS_LIBS
 XFT_CFLAGS
 XFT_LIBS
 FREETYPE_CFLAGS
 FREETYPE_LIBS
 FONTCONFIG_CFLAGS
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE}'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
 infodir='${datarootdir}/info'
 htmldir='${docdir}'
 dvidir='${docdir}'
 pdfdir='${docdir}'
 psdir='${docdir}'
 #
 if test "$ac_init_help" = "long"; then
 # Omit some internal or obsolete options to make the list less imposing.
 # This message is too long to be a string in the A/UX 3.1 sh.
 cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
+\`configure' configures emacs 23.0.50 to adapt to many kinds of systems.
 Usage: $0 [OPTION]... [VAR=VALUE]...
 To assign environment variables (e.g., CC, CFLAGS...), specify them as
 VAR=VALUE.  See below for descriptions of some of the useful variables.
 --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
 --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
 --infodir=DIR          info documentation [DATAROOTDIR/info]
 --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
 --mandir=DIR           man documentation [DATAROOTDIR/man]
---docdir=DIR           documentation root [DATAROOTDIR/doc/PACKAGE]
+--docdir=DIR           documentation root [DATAROOTDIR/doc/emacs]
 --htmldir=DIR          html documentation [DOCDIR]
 --dvidir=DIR           dvi documentation [DOCDIR]
 --pdfdir=DIR           pdf documentation [DOCDIR]
 --psdir=DIR            ps documentation [DOCDIR]
 _ACEOF
 --host=HOST       cross-compile to build programs to run on HOST [BUILD]
 _ACEOF
 fi
 if test -n "$ac_init_help"; then
+case $ac_init_help in
+short | recursive ) echo "Configuration of emacs 23.0.50:";;
+esac
 cat <<\_ACEOF
 Optional Features:
 --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
 --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
 --without-toolkit-scroll-bars
 don't use Motif or Xaw3d scroll bars
 --without-xaw3d         don't use Xaw3d
 --without-xim           don't use X11 XIM
 --without-carbon        don't use Carbon GUI on Mac OS X
+--without-dbus          don't use D-Bus
 --with-x                use the X Window System
 Some influential environment variables:
 CC          C compiler command
 CFLAGS      C compiler flags
 fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
 cat <<\_ACEOF
-configure
+emacs configure 23.0.50
 generated by GNU Autoconf 2.61
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 fi
 cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
-It was created by $as_me, which was
+It was created by emacs $as_me 23.0.50, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 $ $0 $@
 _ACEOF
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 ac_config_headers="$ac_config_headers src/config.h:src/config.in"
 test "$program_prefix" != NONE &&
 program_transform_name="s&^&$program_prefix&;$program_transform_name"
 # Use a double $ so make ignores it.
 # Check whether --with-carbon was given.
 if test "${with_carbon+set}" = set; then
 withval=$with_carbon;
+fi
+# Check whether --with-dbus was given.
+if test "${with_dbus+set}" = set; then
+withval=$with_dbus;
 fi
 # Check whether --enable-carbon-app was given.
 if test "${enable_carbon_app+set}" = set; then
 ia64-*-freebsd*)		machine=ia64 ;;
 sparc64-*-freebsd*)	machine=sparc ;;
 powerpc-*-freebsd*)	machine=macppc ;;
 i[3456]86-*-freebsd*)	machine=intel386 ;;
 amd64-*-freebsd*|x86_64-*-freebsd*) machine=amdx86-64 ;;
+esac
+;;
+## FreeBSD kernel + glibc based userland
+*-*-kfreebsd*gnu* )
+opsys=gnu-kfreebsd
+case "${canonical}" in
+alpha*-*-kfreebsd*)	machine=alpha ;;
+ia64-*-kfreebsd*)		machine=ia64 ;;
+sparc64-*-kfreebsd*)	machine=sparc ;;
+powerpc-*-kfreebsd*)	machine=macppc ;;
+i[3456]86-*-kfreebsd*)	machine=intel386 ;;
+amd64-*-kfreebsd*|x86_64-*-kfreebsd*) machine=amdx86-64 ;;
 esac
 ;;
 ## NetBSD ports
 *-*-netbsd* )
 fi
 fi
 fi
+HAVE_DBUS=no
+if test "${with_dbus}" = "yes"; then
+succeeded=no
+if test -z "$PKG_CONFIG"; then
+# Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+case $PKG_CONFIG in
+[\\/]* | ?:[\\/]*)
+ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+;;
+*)
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+IFS=$as_save_IFS
+test -z "$as_dir" && as_dir=.
+for ac_exec_ext in '' $ac_executable_extensions; do
+if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+break 2
+fi
+done
+done
+IFS=$as_save_IFS
+test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+{ echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
+else
+{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+fi
+if test "$PKG_CONFIG" = "no" ; then
+HAVE_DBUS=no
+else
+PKG_CONFIG_MIN_VERSION=0.9.0
+if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+{ echo "$as_me:$LINENO: checking for dbus-1 >= 1.0" >&5
+echo $ECHO_N "checking for dbus-1 >= 1.0... $ECHO_C" >&6; }
+if $PKG_CONFIG --exists "dbus-1 >= 1.0" 2>&5; then
+{ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+succeeded=yes
+{ echo "$as_me:$LINENO: checking DBUS_CFLAGS" >&5
+echo $ECHO_N "checking DBUS_CFLAGS... $ECHO_C" >&6; }
+DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= 1.0"|sed -e 's,///*,/,g'`
+{ echo "$as_me:$LINENO: result: $DBUS_CFLAGS" >&5
+echo "${ECHO_T}$DBUS_CFLAGS" >&6; }
+{ echo "$as_me:$LINENO: checking DBUS_LIBS" >&5
+echo $ECHO_N "checking DBUS_LIBS... $ECHO_C" >&6; }
+DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 >= 1.0"|sed -e 's,///*,/,g'`
+{ echo "$as_me:$LINENO: result: $DBUS_LIBS" >&5
+echo "${ECHO_T}$DBUS_LIBS" >&6; }
+else
+{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+DBUS_CFLAGS=""
+DBUS_LIBS=""
+## If we have a custom action on failure, don't print errors, but
+## do set a variable so people can do so.
+DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dbus-1 >= 1.0"`
+fi
+else
+echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+echo "*** See http://www.freedesktop.org/software/pkgconfig"
+fi
+fi
+if test $succeeded = yes; then
+HAVE_DBUS=yes
+else
+HAVE_DBUS=no
+fi
+if test "$HAVE_DBUS" = yes; then
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_DBUS 1
+_ACEOF
+fi
+fi
 HAVE_XAW3D=no
 if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then
 if test "$with_xaw3d" != no; then
 { echo "$as_me:$LINENO: checking for xaw3d" >&5
 echo $ECHO_N "checking for xaw3d... $ECHO_C" >&6; }
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <sys/types.h> /* for off_t */
+#include <stdio.h>
-#include <stdio.h>
 int
 main ()
 {
-int (*fp) (FILE *, off_t, int) = fseeko;
+return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
-return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
 ;
 return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #define _LARGEFILE_SOURCE 1
-#include <sys/types.h> /* for off_t */
+#include <stdio.h>
-#include <stdio.h>
 int
 main ()
 {
-int (*fp) (FILE *, off_t, int) = fseeko;
+return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
-return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
 ;
 return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 # Do we have res_init, for detecting changes in /etc/resolv.conf?
 resolv=no
-{ echo "$as_me:$LINENO: checking for res_init" >&5
+cat >conftest.$ac_ext <<_ACEOF
-echo $ECHO_N "checking for res_init... $ECHO_C" >&6; }
-if test "${ac_cv_func_res_init+set}" = set; then
-echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define res_init to an innocuous variant, in case <limits.h> declares res_init.
-For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define res_init innocuous_res_init
-/* System header to define __stub macros and hopefully few prototypes,
-which can conflict with char res_init (); below.
-Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-<limits.h> exists even on freestanding compilers.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-#undef res_init
-/* Override any GCC internal prototype to avoid an error.
-Use char because int might match the return type of a GCC
-builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char res_init ();
-/* The GNU C library defines this for functions which it implements
-to always fail with ENOSYS.  Some functions are actually named
-something starting with __ and the normal name is an alias.  */
-#if defined __stub_res_init || defined __stub___res_init
-choke me
-#endif
-int
-main ()
-{
-return res_init ();
-;
-return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-*) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-(eval "$ac_link") 2>conftest.er1
-ac_status=$?
-grep -v '^ *+' conftest.er1 >conftest.err
-rm -f conftest.er1
-cat conftest.err >&5
-echo "$as_me:$LINENO: \$? = $ac_status" >&5
-(exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-} && test -s conftest$ac_exeext &&
-$as_test_x conftest$ac_exeext; then
-ac_cv_func_res_init=yes
-else
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-	ac_cv_func_res_init=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_res_init" >&5
-echo "${ECHO_T}$ac_cv_func_res_init" >&6; }
-if test $ac_cv_func_res_init = yes; then
-have_res_init=yes
-else
-have_res_init=no
-fi
-if test "$have_res_init" = no; then
-OLIBS="$LIBS"
-LIBS="$LIBS -lresolv"
-{ echo "$as_me:$LINENO: checking for res_init with -lresolv" >&5
-echo $ECHO_N "checking for res_init with -lresolv... $ECHO_C" >&6; }
-cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <arpa/nameser.h>
 #include <resolv.h>
 int
 main ()
 {
-res_init();
+return res_init();
+;
+return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+*) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+(eval "$ac_link") 2>conftest.er1
+ac_status=$?
+grep -v '^ *+' conftest.er1 >conftest.err
+rm -f conftest.er1
+cat conftest.err >&5
+echo "$as_me:$LINENO: \$? = $ac_status" >&5
+(exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+} && test -s conftest$ac_exeext &&
+$as_test_x conftest$ac_exeext; then
+have_res_init=yes
+else
+echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+	have_res_init=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+conftest$ac_exeext conftest.$ac_ext
+if test "$have_res_init" = no; then
+OLIBS="$LIBS"
+LIBS="$LIBS -lresolv"
+{ echo "$as_me:$LINENO: checking for res_init with -lresolv" >&5
+echo $ECHO_N "checking for res_init with -lresolv... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <netinet/in.h>
+#include <arpa/nameser.h>
+#include <resolv.h>
+int
+main ()
+{
+return res_init();
 ;
 return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 known problems.  It is not recommended for use by non-developers.
 Read the emacs-devel archives for more information."
 echo
 fi
+if test "$HAVE_DBUS" = yes && test "${opsys}" != "gnu-linux"; then
+echo "D-Bus integration has been tested for GNU/Linux only."
+echo
+fi
 # Remove any trailing slashes in these variables.
 test "${prefix}" != NONE &&
 prefix=`echo "${prefix}" | sed 's,\([^/]\)/*$,\1,'`
 test "${exec_prefix}" != NONE &&
 # Save the log message, to keep $[0] and so on meaningful, and to
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by $as_me, which was
+This file was extended by emacs $as_me 23.0.50, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 CONFIG_FILES    = $CONFIG_FILES
 CONFIG_HEADERS  = $CONFIG_HEADERS
 CONFIG_LINKS    = $CONFIG_LINKS
 Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-config.status
+emacs config.status 23.0.50
 configured by $0, generated by GNU Autoconf 2.61,
 with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 Copyright (C) 2006 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 HAVE_XSERVER!$HAVE_XSERVER$ac_delim
 RSVG_CFLAGS!$RSVG_CFLAGS$ac_delim
 RSVG_LIBS!$RSVG_LIBS$ac_delim
 GTK_CFLAGS!$GTK_CFLAGS$ac_delim
 GTK_LIBS!$GTK_LIBS$ac_delim
+DBUS_CFLAGS!$DBUS_CFLAGS$ac_delim
+DBUS_LIBS!$DBUS_LIBS$ac_delim
 XFT_CFLAGS!$XFT_CFLAGS$ac_delim
 XFT_LIBS!$XFT_LIBS$ac_delim
 FREETYPE_CFLAGS!$FREETYPE_CFLAGS$ac_delim
 FREETYPE_LIBS!$FREETYPE_LIBS$ac_delim
 FONTCONFIG_CFLAGS!$FONTCONFIG_CFLAGS$ac_delim
 NEED_SETGID!$NEED_SETGID$ac_delim
 KMEM_GROUP!$KMEM_GROUP$ac_delim
 GETLOADAVG_LIBS!$GETLOADAVG_LIBS$ac_delim
 GETOPT_H!$GETOPT_H$ac_delim
 GETOPTOBJS!$GETOPTOBJS$ac_delim
-version!$version$ac_delim
-configuration!$configuration$ac_delim
 _ACEOF
 if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
 break
 elif $ac_last_try; then
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
 cat >conf$$subs.sed <<_ACEOF
+version!$version$ac_delim
+configuration!$configuration$ac_delim
 canonical!$canonical$ac_delim
 srcdir!$srcdir$ac_delim
 lispdir!$lispdir$ac_delim
 locallisppath!$locallisppath$ac_delim
 lisppath!$lisppath$ac_delim
 opsysfile!$opsysfile$ac_delim
 carbon_appdir!$carbon_appdir$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
-if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 21; then
+if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 23; then
 break
 elif $ac_last_try; then
 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
 echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
 { (exit 1); exit 1; }; }

Mercurial > emacs

comparison configure @ 91204:53108e6cea98