Mercurial > emacs
changeset 112404:2b0d6f7bbb80
Merge: src/config.in: shrink slightly
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Fri, 21 Jan 2011 16:13:42 -0800 |
| parents | e80422318be4 (current diff) c81ff7082a9a (diff) |
| children | c04fdfa95f79 |
| files | |
| diffstat | 11 files changed, 176 insertions(+), 160 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Jan 21 23:33:46 2011 +0000 +++ b/ChangeLog Fri Jan 21 16:13:42 2011 -0800 @@ -1,5 +1,15 @@ 2011-01-21 Paul Eggert <eggert@cs.ucla.edu> + src/config.in: shrink slightly + * configure.in: Invoke the new gnulib macro gl_ASSERT_NO_GNULIB_TESTS. + This makes src/config.in a bit smaller, by removing identifiers + like GNULIB_TEST_MKTIME that Emacs does not need. + * m4/getopt.m4, m4/gnulib-common.m4, m4/include_next.m4: + * m4/multiarch.m4, m4/stddef_h.m4, m4/time_h.m4, m4/unistd_h.m4: + Sync from gnulib. This removes a few more unnecessary symbols from + src/config.in, such as AA_APPLE_UNIVERSAL_BUILD and HAVE_STDDEF_H. + * configure, src/config.in: Regenerate. + aclocal.m4: tweaks to regenerate more conveniently This attempts to act better when the source is in a weird state. See <http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00734.html>.
--- a/configure Fri Jan 21 23:33:46 2011 +0000 +++ b/configure Fri Jan 21 16:13:42 2011 -0800 @@ -2658,8 +2658,6 @@ gl_getopt_required=GNU as_fn_append ac_header_list " getopt.h" as_fn_append ac_func_list " alarm" -as_fn_append ac_header_list " stddef.h" -as_fn_append ac_header_list " time.h" as_fn_append ac_header_list " sys/time.h" as_fn_append ac_func_list " localtime_r" # Check that the precious variables saved in the cache have kept the same @@ -13570,6 +13568,9 @@ + + + LIBC_FATAL_STDERR_=1 export LIBC_FATAL_STDERR_ @@ -13851,6 +13852,9 @@ + + + if test $gl_cv_have_include_next = yes; then gl_cv_next_getopt_h='<'getopt.h'>' else @@ -13860,26 +13864,29 @@ $as_echo_n "(cached) " >&6 else - if test $ac_cv_header_getopt_h = yes; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + if test $ac_cv_header_getopt_h = yes; then + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <getopt.h> _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac - gl_cv_next_getopt_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n '\#/getopt.h#{ - s#.*"\(.*/getopt.h\)".*#\1# - s#^/[^/]#//&# - p - q - }'`'"' + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_getopt_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n '\#/getopt.h#{ + s#.*"\(.*/getopt.h\)".*#\1# + s#^/[^/]#//&# + p + q + }'`'"' else - gl_cv_next_getopt_h='<'getopt.h'>' - fi + gl_cv_next_getopt_h='<'getopt.h'>' + fi + fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_getopt_h" >&5 @@ -14337,9 +14344,6 @@ fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test $gl_cv_c_multiarch = yes; then - -$as_echo "#define AA_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h - APPLE_UNIVERSAL_BUILD=1 else APPLE_UNIVERSAL_BUILD=0 @@ -14426,8 +14430,6 @@ fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5 $as_echo_n "checking for C/C++ restrict keyword... " >&6; } if ${ac_cv_c_restrict+:} false; then : @@ -14478,8 +14480,6 @@ - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <time.h>" >&5 $as_echo_n "checking for struct timespec in <time.h>... " >&6; } if ${gl_cv_sys_struct_timespec_in_time_h+:} false; then : @@ -14586,6 +14586,8 @@ + + if test $gl_cv_have_include_next = yes; then gl_cv_next_time_h='<'time.h'>' else @@ -14595,26 +14597,23 @@ $as_echo_n "(cached) " >&6 else - if test $ac_cv_header_time_h = yes; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <time.h> _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac - gl_cv_next_time_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n '\#/time.h#{ - s#.*"\(.*/time.h\)".*#\1# - s#^/[^/]#//&# - p - q - }'`'"' - else - gl_cv_next_time_h='<'time.h'>' - fi + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_time_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n '\#/time.h#{ + s#.*"\(.*/time.h\)".*#\1# + s#^/[^/]#//&# + p + q + }'`'"' + fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_time_h" >&5 @@ -14635,6 +14634,7 @@ + ac_fn_c_check_decl "$LINENO" "localtime_r" "ac_cv_have_decl_localtime_r" "$ac_includes_default" if test "x$ac_cv_have_decl_localtime_r" = xyes; then : ac_have_decl=1 @@ -14683,10 +14683,6 @@ - -$as_echo "#define GNULIB_TEST_GETOPT_GNU 1" >>confdefs.h - - # Code from module getopt-posix: @@ -14989,10 +14985,6 @@ -$as_echo "#define GNULIB_TEST_MKTIME 1" >>confdefs.h - - - # Code from module multiarch: # Code from module stddef: @@ -15041,6 +15033,8 @@ + + if test $gl_cv_have_include_next = yes; then gl_cv_next_stddef_h='<'stddef.h'>' else @@ -15050,26 +15044,23 @@ $as_echo_n "(cached) " >&6 else - if test $ac_cv_header_stddef_h = yes; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stddef.h> _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac - gl_cv_next_stddef_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n '\#/stddef.h#{ - s#.*"\(.*/stddef.h\)".*#\1# - s#^/[^/]#//&# - p - q - }'`'"' - else - gl_cv_next_stddef_h='<'stddef.h'>' - fi + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_stddef_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n '\#/stddef.h#{ + s#.*"\(.*/stddef.h\)".*#\1# + s#^/[^/]#//&# + p + q + }'`'"' + fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stddef_h" >&5 @@ -15088,6 +15079,7 @@ + fi # Code from module time: @@ -15174,10 +15166,6 @@ -$as_echo "#define GNULIB_TEST_TIME_R 1" >>confdefs.h - - - # Code from module unistd: @@ -15189,6 +15177,9 @@ + + + if test $gl_cv_have_include_next = yes; then gl_cv_next_unistd_h='<'unistd.h'>' else @@ -15198,26 +15189,29 @@ $as_echo_n "(cached) " >&6 else - if test $ac_cv_header_unistd_h = yes; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + if test $ac_cv_header_unistd_h = yes; then + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <unistd.h> _ACEOF - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac - gl_cv_next_unistd_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | - sed -n '\#/unistd.h#{ - s#.*"\(.*/unistd.h\)".*#\1# - s#^/[^/]#//&# - p - q - }'`'"' + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + gl_cv_next_unistd_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n '\#/unistd.h#{ + s#.*"\(.*/unistd.h\)".*#\1# + s#^/[^/]#//&# + p + q + }'`'"' else - gl_cv_next_unistd_h='<'unistd.h'>' - fi + gl_cv_next_unistd_h='<'unistd.h'>' + fi + fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_unistd_h" >&5 @@ -15237,7 +15231,6 @@ - if test $ac_cv_header_unistd_h = yes; then HAVE_UNISTD_H=1 else
--- a/configure.in Fri Jan 21 23:33:46 2011 +0000 +++ b/configure.in Fri Jan 21 16:13:42 2011 -0800 @@ -877,11 +877,11 @@ # emacs, instead of the generic ELF dump code found in unexelf.c. # The resulting binary has a complete symbol table, and is better # for debugging and other observability tools (debuggers, pstack, etc). - # + # # If you encounter a problem using dldump(), please consider sending # a message to the OpenSolaris tools-linking mailing list: # http://mail.opensolaris.org/mailman/listinfo/tools-linking - # + # # It is likely that dldump() works with older Solaris too, but this has # not been tested, so for now this change is for Solaris 10 or newer. UNEXEC_OBJ=unexsol.o @@ -948,7 +948,7 @@ AC_MSG_ERROR([What gives? Fix me if DEC Unix supports ELF now.]) fi else - UNEXEC_OBJ=unexalpha.o + UNEXEC_OBJ=unexalpha.o fi fi AC_SUBST(C_SWITCH_MACHINE) @@ -1130,7 +1130,7 @@ if test "${with_sound}" != "no"; then # Sound support for GNU/Linux and the free BSDs. - AC_CHECK_HEADERS(machine/soundcard.h sys/soundcard.h soundcard.h, + AC_CHECK_HEADERS(machine/soundcard.h sys/soundcard.h soundcard.h, have_sound_header=yes) # Emulation library used on NetBSD. AC_CHECK_LIB(ossaudio, _oss_ioctl, LIBSOUND=-lossaudio, LIBSOUND=) @@ -1817,7 +1817,7 @@ PKG_CHECK_MODULES(IMAGEMAGICK, $IMAGEMAGICK_MODULE, HAVE_IMAGEMAGICK=yes, :) AC_SUBST(IMAGEMAGICK_CFLAGS) AC_SUBST(IMAGEMAGICK_LIBS) - + if test $HAVE_IMAGEMAGICK = yes; then AC_DEFINE(HAVE_IMAGEMAGICK, 1, [Define to 1 if using imagemagick.]) CFLAGS="$CFLAGS $IMAGEMAGICK_CFLAGS" @@ -2670,6 +2670,7 @@ AC_FUNC_GETPGRP # Configure gnulib. +gl_ASSERT_NO_GNULIB_TESTS gl_INIT AC_FUNC_STRFTIME @@ -3241,7 +3242,7 @@ if test "$HAVE_GTK" = "yes" || test "$HAVE_MENUS" != "yes"; then OLDXMENU_TARGET= - OLDXMENU=nothing + OLDXMENU=nothing LIBXMENU= OLDXMENU_DEPS= fi @@ -3305,7 +3306,7 @@ headerpad_extra=690 fi LD_SWITCH_SYSTEM_TEMACS="-prebind $libs_nsgui -Xlinker -headerpad -Xlinker $headerpad_extra" - + ## This is here because src/Makefile.in did some extra fiddling around ## with LD_SWITCH_SYSTEM. The cpp logic was: ## #ifndef LD_SWITCH_SYSTEM
--- a/m4/getopt.m4 Fri Jan 21 23:33:46 2011 +0000 +++ b/m4/getopt.m4 Fri Jan 21 16:13:42 2011 -0800 @@ -1,4 +1,4 @@ -# getopt.m4 serial 32 +# getopt.m4 serial 33 dnl Copyright (C) 2002-2006, 2008-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -56,7 +56,6 @@ AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) gl_CHECK_NEXT_HEADERS([getopt.h]) - AC_CHECK_HEADERS_ONCE([getopt.h]) if test $ac_cv_header_getopt_h = yes; then HAVE_GETOPT_H=1 else
--- a/m4/gnulib-common.m4 Fri Jan 21 23:33:46 2011 +0000 +++ b/m4/gnulib-common.m4 Fri Jan 21 16:13:42 2011 -0800 @@ -1,4 +1,4 @@ -# gnulib-common.m4 serial 21 +# gnulib-common.m4 serial 22 dnl Copyright (C) 2007-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -102,6 +102,16 @@ [Define to 1 when the gnulib module $1 should be tested.]) ]) +# gl_ASSERT_NO_GNULIB_TESTS +# asserts that there will be no gnulib tests in the scope of the configure.ac +# and thereby enables an optimization of config.h. +# Used by Emacs. +AC_DEFUN([gl_ASSERT_NO_GNULIB_TESTS], +[ + dnl Override gl_MODULE_INDICATOR_FOR_TESTS. + AC_DEFUN([gl_MODULE_INDICATOR_FOR_TESTS], []) +]) + # Test whether <features.h> exists. # Set HAVE_FEATURES_H. AC_DEFUN([gl_FEATURES_H],
--- a/m4/include_next.m4 Fri Jan 21 23:33:46 2011 +0000 +++ b/m4/include_next.m4 Fri Jan 21 16:13:42 2011 -0800 @@ -1,4 +1,4 @@ -# include_next.m4 serial 16 +# include_next.m4 serial 18 dnl Copyright (C) 2006-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -147,11 +147,33 @@ # Note: This macro assumes that the header file is not empty after # preprocessing, i.e. it does not only define preprocessor macros but also # provides some type/enum definitions or function/variable declarations. +# +# This macro also checks whether each header exists, by invoking +# AC_CHECK_HEADERS_ONCE or AC_CHECK_HEADERS on each argument. AC_DEFUN([gl_CHECK_NEXT_HEADERS], [ + gl_NEXT_HEADERS_INTERNAL([$1], [check]) +]) + +# gl_NEXT_HEADERS(HEADER1 HEADER2 ...) +# ------------------------------------ +# Like gl_CHECK_NEXT_HEADERS, except do not check whether the headers exist. +# This is suitable for headers like <stddef.h> that are standardized by C89 +# and therefore can be assumed to exist. +AC_DEFUN([gl_NEXT_HEADERS], +[ + gl_NEXT_HEADERS_INTERNAL([$1], [assume]) +]) + +# The guts of gl_CHECK_NEXT_HEADERS and gl_NEXT_HEADERS. +AC_DEFUN([gl_NEXT_HEADERS_INTERNAL], +[ AC_REQUIRE([gl_INCLUDE_NEXT]) AC_REQUIRE([AC_CANONICAL_HOST]) - AC_CHECK_HEADERS_ONCE([$1]) + + m4_if([$2], [check], + [AC_CHECK_HEADERS_ONCE([$1]) + ]) m4_foreach_w([gl_HEADER_NAME], [$1], [AS_VAR_PUSHDEF([gl_next_header], @@ -162,39 +184,44 @@ AC_CACHE_CHECK( [absolute name of <]m4_defn([gl_HEADER_NAME])[>], m4_defn([gl_next_header]), - [AS_VAR_PUSHDEF([gl_header_exists], - [ac_cv_header_]m4_defn([gl_HEADER_NAME])) - if test AS_VAR_GET(gl_header_exists) = yes; then - AC_LANG_CONFTEST( - [AC_LANG_SOURCE( - [[#include <]]m4_dquote(m4_defn([gl_HEADER_NAME]))[[>]] - )]) - dnl AIX "xlc -E" and "cc -E" omit #line directives for header files - dnl that contain only a #include of other header files and no - dnl non-comment tokens of their own. This leads to a failure to - dnl detect the absolute name of <dirent.h>, <signal.h>, <poll.h> - dnl and others. The workaround is to force preservation of comments - dnl through option -C. This ensures all necessary #line directives - dnl are present. GCC supports option -C as well. - case "$host_os" in - aix*) gl_absname_cpp="$ac_cpp -C" ;; - *) gl_absname_cpp="$ac_cpp" ;; - esac - dnl eval is necessary to expand gl_absname_cpp. - dnl Ultrix and Pyramid sh refuse to redirect output of eval, - dnl so use subshell. - AS_VAR_SET([gl_next_header], - ['"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD | - sed -n '\#/]m4_defn([gl_HEADER_NAME])[#{ - s#.*"\(.*/]m4_defn([gl_HEADER_NAME])[\)".*#\1# - s#^/[^/]#//&# - p - q - }'`'"']) - else - AS_VAR_SET([gl_next_header], ['<'gl_HEADER_NAME'>']) - fi - AS_VAR_POPDEF([gl_header_exists])]) + [m4_if([$2], [check], + [AS_VAR_PUSHDEF([gl_header_exists], + [ac_cv_header_]m4_defn([gl_HEADER_NAME])) + if test AS_VAR_GET(gl_header_exists) = yes; then + AS_VAR_POPDEF([gl_header_exists]) + ]) + AC_LANG_CONFTEST( + [AC_LANG_SOURCE( + [[#include <]]m4_dquote(m4_defn([gl_HEADER_NAME]))[[>]] + )]) + dnl AIX "xlc -E" and "cc -E" omit #line directives for header + dnl files that contain only a #include of other header files and + dnl no non-comment tokens of their own. This leads to a failure + dnl to detect the absolute name of <dirent.h>, <signal.h>, + dnl <poll.h> and others. The workaround is to force preservation + dnl of comments through option -C. This ensures all necessary + dnl #line directives are present. GCC supports option -C as well. + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + dnl eval is necessary to expand gl_absname_cpp. + dnl Ultrix and Pyramid sh refuse to redirect output of eval, + dnl so use subshell. + AS_VAR_SET([gl_next_header], + ['"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD | + sed -n '\#/]m4_defn([gl_HEADER_NAME])[#{ + s#.*"\(.*/]m4_defn([gl_HEADER_NAME])[\)".*#\1# + s#^/[^/]#//&# + p + q + }'`'"']) + m4_if([$2], [check], + [else + AS_VAR_SET([gl_next_header], ['<'gl_HEADER_NAME'>']) + fi + ]) + ]) fi AC_SUBST( AS_TR_CPP([NEXT_]m4_defn([gl_HEADER_NAME])),
--- a/m4/multiarch.m4 Fri Jan 21 23:33:46 2011 +0000 +++ b/m4/multiarch.m4 Fri Jan 21 16:13:42 2011 -0800 @@ -1,4 +1,4 @@ -# multiarch.m4 serial 5 +# multiarch.m4 serial 6 dnl Copyright (C) 2008-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -16,8 +16,7 @@ # CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ # CPP="gcc -E" CXXCPP="g++ -E" # -# Detect this situation and set the macro AA_APPLE_UNIVERSAL_BUILD at the -# beginning of config.h and set APPLE_UNIVERSAL_BUILD accordingly. +# Detect this situation and set APPLE_UNIVERSAL_BUILD accordingly. AC_DEFUN_ONCE([gl_MULTIARCH], [ @@ -55,8 +54,6 @@ done ]) if test $gl_cv_c_multiarch = yes; then - AC_DEFINE([AA_APPLE_UNIVERSAL_BUILD], [1], - [Define if the compiler is building for multiple architectures of Apple platforms at once.]) APPLE_UNIVERSAL_BUILD=1 else APPLE_UNIVERSAL_BUILD=0
--- a/m4/stddef_h.m4 Fri Jan 21 23:33:46 2011 +0000 +++ b/m4/stddef_h.m4 Fri Jan 21 16:13:42 2011 -0800 @@ -1,5 +1,5 @@ dnl A placeholder for POSIX 2008 <stddef.h>, for platforms that have issues. -# stddef_h.m4 serial 2 +# stddef_h.m4 serial 3 dnl Copyright (C) 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -25,7 +25,7 @@ STDDEF_H=stddef.h fi if test -n "$STDDEF_H"; then - gl_CHECK_NEXT_HEADERS([stddef.h]) + gl_NEXT_HEADERS([stddef.h]) fi ])
--- a/m4/time_h.m4 Fri Jan 21 23:33:46 2011 +0000 +++ b/m4/time_h.m4 Fri Jan 21 16:13:42 2011 -0800 @@ -2,7 +2,7 @@ # Copyright (C) 2000-2001, 2003-2007, 2009-2011 Free Software Foundation, Inc. -# serial 3 +# serial 4 # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -21,7 +21,7 @@ [ AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) - gl_CHECK_NEXT_HEADERS([time.h]) + gl_NEXT_HEADERS([time.h]) AC_REQUIRE([gl_CHECK_TYPE_STRUCT_TIMESPEC]) ])
--- a/m4/unistd_h.m4 Fri Jan 21 23:33:46 2011 +0000 +++ b/m4/unistd_h.m4 Fri Jan 21 16:13:42 2011 -0800 @@ -1,4 +1,4 @@ -# unistd_h.m4 serial 52 +# unistd_h.m4 serial 53 dnl Copyright (C) 2006-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -14,8 +14,6 @@ AC_REQUIRE([AC_C_INLINE]) gl_CHECK_NEXT_HEADERS([unistd.h]) - - AC_CHECK_HEADERS_ONCE([unistd.h]) if test $ac_cv_header_unistd_h = yes; then HAVE_UNISTD_H=1 else
--- a/src/config.in Fri Jan 21 23:33:46 2011 +0000 +++ b/src/config.in Fri Jan 21 16:13:42 2011 -0800 @@ -27,10 +27,6 @@ #define EMACS_CONFIG_H -/* Define if the compiler is building for multiple architectures of Apple - platforms at once. */ -#undef AA_APPLE_UNIVERSAL_BUILD - /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD @@ -87,15 +83,6 @@ /* Define to 1 if gettimeofday accepts only one argument. */ #undef GETTIMEOFDAY_ONE_ARGUMENT -/* Define to 1 when the gnulib module getopt-gnu should be tested. */ -#undef GNULIB_TEST_GETOPT_GNU - -/* Define to 1 when the gnulib module mktime should be tested. */ -#undef GNULIB_TEST_MKTIME - -/* Define to 1 when the gnulib module time_r should be tested. */ -#undef GNULIB_TEST_TIME_R - /* Define to 1 if you want to use the GNU memory allocator. */ #undef GNU_MALLOC @@ -752,9 +739,6 @@ /* Define to 1 if `speed_t' is declared by <termios.h>. */ #undef HAVE_SPEED_T -/* Define to 1 if you have the <stddef.h> header file. */ -#undef HAVE_STDDEF_H - /* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H @@ -869,9 +853,6 @@ /* Define to 1 if `struct timeval' is declared by <sys/time.h>. */ #undef HAVE_TIMEVAL -/* Define to 1 if you have the <time.h> header file. */ -#undef HAVE_TIME_H - /* Define to 1 if `tm_gmtoff' is member of `struct tm'. */ #undef HAVE_TM_GMTOFF