summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-01-21 16:12:10 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2011-01-21 16:12:10 -0800
commitb06b1098fc4c4ee793c87c4b4b63366a1422d64f (patch)
treeb5b3eeb54bf3287c54de333ee1b31eebf3ad5fb7 /configure
parent925e561d3257c74833d68b809ff3dc0d96f284a5 (diff)
downloademacs-b06b1098fc4c4ee793c87c4b4b63366a1422d64f.tar.gz
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.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure157
1 files changed, 75 insertions, 82 deletions
diff --git a/configure b/configure
index 56701c27f5b..7e51212fc28 100755
--- a/configure
+++ b/configure
@@ -2658,8 +2658,6 @@ as_fn_append ac_header_list " sys/param.h"
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 @@ fi
+
+
+
LIBC_FATAL_STDERR_=1
export LIBC_FATAL_STDERR_
@@ -13851,6 +13852,9 @@ $as_echo "$gl_cv_pragma_columns" >&6; }
+
+
+
if test $gl_cv_have_include_next = yes; then
gl_cv_next_getopt_h='<'getopt.h'>'
else
@@ -13860,26 +13864,29 @@ if ${gl_cv_next_getopt_h+:} false; then :
$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 @@ if ac_fn_c_try_compile "$LINENO"; then :
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 @@ $as_echo "#define HAVE_WCHAR_T 1" >>confdefs.h
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 @@ _ACEOF
-
-
{ $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 @@ $as_echo "$gl_cv_sys_struct_timespec_in_pthread_h" >&6; }
+
+
if test $gl_cv_have_include_next = yes; then
gl_cv_next_time_h='<'time.h'>'
else
@@ -14595,26 +14597,23 @@ if ${gl_cv_next_time_h+:} false; then :
$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 @@ $as_echo "$gl_cv_next_time_h" >&6; }
+
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 @@ fi
-
-$as_echo "#define GNULIB_TEST_GETOPT_GNU 1" >>confdefs.h
-
-
# Code from module getopt-posix:
@@ -14989,10 +14985,6 @@ fi
-$as_echo "#define GNULIB_TEST_MKTIME 1" >>confdefs.h
-
-
-
# Code from module multiarch:
# Code from module stddef:
@@ -15041,6 +15033,8 @@ $as_echo "$gl_cv_decl_null_works" >&6; }
+
+
if test $gl_cv_have_include_next = yes; then
gl_cv_next_stddef_h='<'stddef.h'>'
else
@@ -15050,26 +15044,23 @@ if ${gl_cv_next_stddef_h+:} false; then :
$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 @@ $as_echo "$gl_cv_next_stddef_h" >&6; }
+
fi
# Code from module time:
@@ -15174,11 +15166,10 @@ $as_echo "$gl_cv_time_r_posix" >&6; }
-$as_echo "#define GNULIB_TEST_TIME_R 1" >>confdefs.h
+ # Code from module unistd:
- # Code from module unistd:
@@ -15198,26 +15189,29 @@ if ${gl_cv_next_unistd_h+:} false; then :
$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 @@ $as_echo "$gl_cv_next_unistd_h" >&6; }
-
if test $ac_cv_header_unistd_h = yes; then
HAVE_UNISTD_H=1
else