Mercurial > emacs

comparison configure @ 112403:c81ff7082a9a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Paul Eggert <eggert@cs.ucla.edu>
date Fri, 21 Jan 2011 16:12:10 -0800
parents 19348bd13f81
children 3c76e72abd5d
comparison
equal deleted inserted replaced
112402:a102f5772eaa 112403:c81ff7082a9a
2656 as_fn_append ac_header_list " unistd.h" 2656 as_fn_append ac_header_list " unistd.h"
2657 as_fn_append ac_header_list " sys/param.h" 2657 as_fn_append ac_header_list " sys/param.h"
2658 gl_getopt_required=GNU 2658 gl_getopt_required=GNU
2659 as_fn_append ac_header_list " getopt.h" 2659 as_fn_append ac_header_list " getopt.h"
2660 as_fn_append ac_func_list " alarm" 2660 as_fn_append ac_func_list " alarm"
2661 as_fn_append ac_header_list " stddef.h"
2662 as_fn_append ac_header_list " time.h"
2663 as_fn_append ac_header_list " sys/time.h" 2661 as_fn_append ac_header_list " sys/time.h"
2664 as_fn_append ac_func_list " localtime_r" 2662 as_fn_append ac_func_list " localtime_r"
2665 # Check that the precious variables saved in the cache have kept the same 2663 # Check that the precious variables saved in the cache have kept the same
2666 # value. 2664 # value.
2667 ac_cache_corrupted=false 2665 ac_cache_corrupted=false
13564 13562
13565 fi 13563 fi
13566 13564
13567 13565
13568 # Configure gnulib. 13566 # Configure gnulib.
13567
13568
13569
13569 13570
13570 13571
13571 13572
13572 13573
13573 LIBC_FATAL_STDERR_=1 13574 LIBC_FATAL_STDERR_=1
13849 13850
13850 13851
13851 13852
13852 13853
13853 13854
13855
13856
13857
13854 if test $gl_cv_have_include_next = yes; then 13858 if test $gl_cv_have_include_next = yes; then
13855 gl_cv_next_getopt_h='<'getopt.h'>' 13859 gl_cv_next_getopt_h='<'getopt.h'>'
13856 else 13860 else
13857 { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <getopt.h>" >&5 13861 { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <getopt.h>" >&5
13858 $as_echo_n "checking absolute name of <getopt.h>... " >&6; } 13862 $as_echo_n "checking absolute name of <getopt.h>... " >&6; }
13859 if ${gl_cv_next_getopt_h+:} false; then : 13863 if ${gl_cv_next_getopt_h+:} false; then :
13860 $as_echo_n "(cached) " >&6 13864 $as_echo_n "(cached) " >&6
13861 else 13865 else
13862 13866
13863 if test $ac_cv_header_getopt_h = yes; then 13867 if test $ac_cv_header_getopt_h = yes; then
13864 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 13868
13869
13870 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
13865 /* end confdefs.h. */ 13871 /* end confdefs.h. */
13866 #include <getopt.h> 13872 #include <getopt.h>
13867 13873
13868 _ACEOF 13874 _ACEOF
13869 case "$host_os" in 13875 case "$host_os" in
13870 aix*) gl_absname_cpp="$ac_cpp -C" ;; 13876 aix*) gl_absname_cpp="$ac_cpp -C" ;;
13871 *) gl_absname_cpp="$ac_cpp" ;; 13877 *) gl_absname_cpp="$ac_cpp" ;;
13872 esac 13878 esac
13873 gl_cv_next_getopt_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | 13879 gl_cv_next_getopt_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
13874 sed -n '\#/getopt.h#{ 13880 sed -n '\#/getopt.h#{
13875 s#.*"\(.*/getopt.h\)".*#\1# 13881 s#.*"\(.*/getopt.h\)".*#\1#
13876 s#^/[^/]#//&# 13882 s#^/[^/]#//&#
13877 p 13883 p
13878 q 13884 q
13879 }'`'"' 13885 }'`'"'
13880 else 13886 else
13881 gl_cv_next_getopt_h='<'getopt.h'>' 13887 gl_cv_next_getopt_h='<'getopt.h'>'
13882 fi 13888 fi
13889
13883 13890
13884 fi 13891 fi
13885 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_getopt_h" >&5 13892 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_getopt_h" >&5
13886 $as_echo "$gl_cv_next_getopt_h" >&6; } 13893 $as_echo "$gl_cv_next_getopt_h" >&6; }
13887 fi 13894 fi
14335 done 14342 done
14336 14343
14337 fi 14344 fi
14338 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 14345 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
14339 if test $gl_cv_c_multiarch = yes; then 14346 if test $gl_cv_c_multiarch = yes; then
14340
14341 $as_echo "#define AA_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
14342
14343 APPLE_UNIVERSAL_BUILD=1 14347 APPLE_UNIVERSAL_BUILD=1
14344 else 14348 else
14345 APPLE_UNIVERSAL_BUILD=0 14349 APPLE_UNIVERSAL_BUILD=0
14346 fi 14350 fi
14347 14351
14423 if test $gt_cv_c_wchar_t = yes; then 14427 if test $gt_cv_c_wchar_t = yes; then
14424 14428
14425 $as_echo "#define HAVE_WCHAR_T 1" >>confdefs.h 14429 $as_echo "#define HAVE_WCHAR_T 1" >>confdefs.h
14426 14430
14427 fi 14431 fi
14428
14429
14430 14432
14431 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5 14433 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5
14432 $as_echo_n "checking for C/C++ restrict keyword... " >&6; } 14434 $as_echo_n "checking for C/C++ restrict keyword... " >&6; }
14433 if ${ac_cv_c_restrict+:} false; then : 14435 if ${ac_cv_c_restrict+:} false; then :
14434 $as_echo_n "(cached) " >&6 14436 $as_echo_n "(cached) " >&6
14476 14478
14477 14479
14478 14480
14479 14481
14480 14482
14481
14482
14483 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <time.h>" >&5 14483 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <time.h>" >&5
14484 $as_echo_n "checking for struct timespec in <time.h>... " >&6; } 14484 $as_echo_n "checking for struct timespec in <time.h>... " >&6; }
14485 if ${gl_cv_sys_struct_timespec_in_time_h+:} false; then : 14485 if ${gl_cv_sys_struct_timespec_in_time_h+:} false; then :
14486 $as_echo_n "(cached) " >&6 14486 $as_echo_n "(cached) " >&6
14487 else 14487 else
14584 14584
14585 14585
14586 14586
14587 14587
14588 14588
14589
14590
14589 if test $gl_cv_have_include_next = yes; then 14591 if test $gl_cv_have_include_next = yes; then
14590 gl_cv_next_time_h='<'time.h'>' 14592 gl_cv_next_time_h='<'time.h'>'
14591 else 14593 else
14592 { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <time.h>" >&5 14594 { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <time.h>" >&5
14593 $as_echo_n "checking absolute name of <time.h>... " >&6; } 14595 $as_echo_n "checking absolute name of <time.h>... " >&6; }
14594 if ${gl_cv_next_time_h+:} false; then : 14596 if ${gl_cv_next_time_h+:} false; then :
14595 $as_echo_n "(cached) " >&6 14597 $as_echo_n "(cached) " >&6
14596 else 14598 else
14597 14599
14598 if test $ac_cv_header_time_h = yes; then 14600 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14599 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
14600 /* end confdefs.h. */ 14601 /* end confdefs.h. */
14601 #include <time.h> 14602 #include <time.h>
14602 14603
14603 _ACEOF 14604 _ACEOF
14604 case "$host_os" in 14605 case "$host_os" in
14605 aix*) gl_absname_cpp="$ac_cpp -C" ;; 14606 aix*) gl_absname_cpp="$ac_cpp -C" ;;
14606 *) gl_absname_cpp="$ac_cpp" ;; 14607 *) gl_absname_cpp="$ac_cpp" ;;
14607 esac 14608 esac
14608 gl_cv_next_time_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | 14609 gl_cv_next_time_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
14609 sed -n '\#/time.h#{ 14610 sed -n '\#/time.h#{
14610 s#.*"\(.*/time.h\)".*#\1# 14611 s#.*"\(.*/time.h\)".*#\1#
14611 s#^/[^/]#//&# 14612 s#^/[^/]#//&#
14612 p 14613 p
14613 q 14614 q
14614 }'`'"' 14615 }'`'"'
14615 else 14616
14616 gl_cv_next_time_h='<'time.h'>'
14617 fi
14618 14617
14619 fi 14618 fi
14620 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_time_h" >&5 14619 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_time_h" >&5
14621 $as_echo "$gl_cv_next_time_h" >&6; } 14620 $as_echo "$gl_cv_next_time_h" >&6; }
14622 fi 14621 fi
14633 14632
14634 14633
14635 14634
14636 14635
14637 14636
14637
14638 ac_fn_c_check_decl "$LINENO" "localtime_r" "ac_cv_have_decl_localtime_r" "$ac_includes_default" 14638 ac_fn_c_check_decl "$LINENO" "localtime_r" "ac_cv_have_decl_localtime_r" "$ac_includes_default"
14639 if test "x$ac_cv_have_decl_localtime_r" = xyes; then : 14639 if test "x$ac_cv_have_decl_localtime_r" = xyes; then :
14640 ac_have_decl=1 14640 ac_have_decl=1
14641 else 14641 else
14642 ac_have_decl=0 14642 ac_have_decl=0
14679 # Code from module getopt-gnu: 14679 # Code from module getopt-gnu:
14680 14680
14681 14681
14682 14682
14683 14683
14684
14685
14686
14687 $as_echo "#define GNULIB_TEST_GETOPT_GNU 1" >>confdefs.h
14688 14684
14689 14685
14690 # Code from module getopt-posix: 14686 # Code from module getopt-posix:
14691 14687
14692 14688
14987 14983
14988 GNULIB_MKTIME=1 14984 GNULIB_MKTIME=1
14989 14985
14990 14986
14991 14987
14992 $as_echo "#define GNULIB_TEST_MKTIME 1" >>confdefs.h
14993
14994
14995
14996 # Code from module multiarch: 14988 # Code from module multiarch:
14997 14989
14998 # Code from module stddef: 14990 # Code from module stddef:
14999 14991
15000 14992
15033 if test $gl_cv_decl_null_works = no; then 15025 if test $gl_cv_decl_null_works = no; then
15034 REPLACE_NULL=1 15026 REPLACE_NULL=1
15035 STDDEF_H=stddef.h 15027 STDDEF_H=stddef.h
15036 fi 15028 fi
15037 if test -n "$STDDEF_H"; then 15029 if test -n "$STDDEF_H"; then
15030
15031
15038 15032
15039 15033
15040 15034
15041 15035
15042 15036
15048 $as_echo_n "checking absolute name of <stddef.h>... " >&6; } 15042 $as_echo_n "checking absolute name of <stddef.h>... " >&6; }
15049 if ${gl_cv_next_stddef_h+:} false; then : 15043 if ${gl_cv_next_stddef_h+:} false; then :
15050 $as_echo_n "(cached) " >&6 15044 $as_echo_n "(cached) " >&6
15051 else 15045 else
15052 15046
15053 if test $ac_cv_header_stddef_h = yes; then 15047 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15054 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15055 /* end confdefs.h. */ 15048 /* end confdefs.h. */
15056 #include <stddef.h> 15049 #include <stddef.h>
15057 15050
15058 _ACEOF 15051 _ACEOF
15059 case "$host_os" in 15052 case "$host_os" in
15060 aix*) gl_absname_cpp="$ac_cpp -C" ;; 15053 aix*) gl_absname_cpp="$ac_cpp -C" ;;
15061 *) gl_absname_cpp="$ac_cpp" ;; 15054 *) gl_absname_cpp="$ac_cpp" ;;
15062 esac 15055 esac
15063 gl_cv_next_stddef_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | 15056 gl_cv_next_stddef_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
15064 sed -n '\#/stddef.h#{ 15057 sed -n '\#/stddef.h#{
15065 s#.*"\(.*/stddef.h\)".*#\1# 15058 s#.*"\(.*/stddef.h\)".*#\1#
15066 s#^/[^/]#//&# 15059 s#^/[^/]#//&#
15067 p 15060 p
15068 q 15061 q
15069 }'`'"' 15062 }'`'"'
15070 else 15063
15071 gl_cv_next_stddef_h='<'stddef.h'>'
15072 fi
15073 15064
15074 fi 15065 fi
15075 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stddef_h" >&5 15066 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_stddef_h" >&5
15076 $as_echo "$gl_cv_next_stddef_h" >&6; } 15067 $as_echo "$gl_cv_next_stddef_h" >&6; }
15077 fi 15068 fi
15083 else 15074 else
15084 # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' 15075 # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
15085 gl_next_as_first_directive=$gl_cv_next_stddef_h 15076 gl_next_as_first_directive=$gl_cv_next_stddef_h
15086 fi 15077 fi
15087 NEXT_AS_FIRST_DIRECTIVE_STDDEF_H=$gl_next_as_first_directive 15078 NEXT_AS_FIRST_DIRECTIVE_STDDEF_H=$gl_next_as_first_directive
15079
15088 15080
15089 15081
15090 15082
15091 fi 15083 fi
15092 15084
15172 15164
15173 GNULIB_TIME_R=1 15165 GNULIB_TIME_R=1
15174 15166
15175 15167
15176 15168
15177 $as_echo "#define GNULIB_TEST_TIME_R 1" >>confdefs.h
15178
15179
15180
15181 # Code from module unistd: 15169 # Code from module unistd:
15170
15171
15172
15182 15173
15183 15174
15184 15175
15185 15176
15186 15177
15196 $as_echo_n "checking absolute name of <unistd.h>... " >&6; } 15187 $as_echo_n "checking absolute name of <unistd.h>... " >&6; }
15197 if ${gl_cv_next_unistd_h+:} false; then : 15188 if ${gl_cv_next_unistd_h+:} false; then :
15198 $as_echo_n "(cached) " >&6 15189 $as_echo_n "(cached) " >&6
15199 else 15190 else
15200 15191
15201 if test $ac_cv_header_unistd_h = yes; then 15192 if test $ac_cv_header_unistd_h = yes; then
15202 cat confdefs.h - <<_ACEOF >conftest.$ac_ext 15193
15194
15195 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15203 /* end confdefs.h. */ 15196 /* end confdefs.h. */
15204 #include <unistd.h> 15197 #include <unistd.h>
15205 15198
15206 _ACEOF 15199 _ACEOF
15207 case "$host_os" in 15200 case "$host_os" in
15208 aix*) gl_absname_cpp="$ac_cpp -C" ;; 15201 aix*) gl_absname_cpp="$ac_cpp -C" ;;
15209 *) gl_absname_cpp="$ac_cpp" ;; 15202 *) gl_absname_cpp="$ac_cpp" ;;
15210 esac 15203 esac
15211 gl_cv_next_unistd_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | 15204 gl_cv_next_unistd_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 |
15212 sed -n '\#/unistd.h#{ 15205 sed -n '\#/unistd.h#{
15213 s#.*"\(.*/unistd.h\)".*#\1# 15206 s#.*"\(.*/unistd.h\)".*#\1#
15214 s#^/[^/]#//&# 15207 s#^/[^/]#//&#
15215 p 15208 p
15216 q 15209 q
15217 }'`'"' 15210 }'`'"'
15218 else 15211 else
15219 gl_cv_next_unistd_h='<'unistd.h'>' 15212 gl_cv_next_unistd_h='<'unistd.h'>'
15220 fi 15213 fi
15214
15221 15215
15222 fi 15216 fi
15223 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_unistd_h" >&5 15217 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_unistd_h" >&5
15224 $as_echo "$gl_cv_next_unistd_h" >&6; } 15218 $as_echo "$gl_cv_next_unistd_h" >&6; }
15225 fi 15219 fi
15231 else 15225 else
15232 # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' 15226 # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include'
15233 gl_next_as_first_directive=$gl_cv_next_unistd_h 15227 gl_next_as_first_directive=$gl_cv_next_unistd_h
15234 fi 15228 fi
15235 NEXT_AS_FIRST_DIRECTIVE_UNISTD_H=$gl_next_as_first_directive 15229 NEXT_AS_FIRST_DIRECTIVE_UNISTD_H=$gl_next_as_first_directive
15236
15237 15230
15238 15231
15239 15232
15240 15233
15241 if test $ac_cv_header_unistd_h = yes; then 15234 if test $ac_cv_header_unistd_h = yes; then