X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/0442dc7f7b592a37bd097ca450a02870f1155096..7cf3f55609dbddcf420f789ece79b190a0ed35a8:/autogen/configure diff --git a/autogen/configure b/autogen/configure index 63d0d9ee39..dbc4873764 100755 --- a/autogen/configure +++ b/autogen/configure @@ -7658,6 +7658,40 @@ if test "X$CRT_DIR" = "X"; then ## Default is /usr/lib. test "X$CRT_DIR" = "X" && CRT_DIR=/usr/lib + ## If we're using gcc, try to determine it automatically by asking + ## gcc. [If this doesn't work, CRT_DIR will remain at the + ## system-dependent default from above.] + if test "x${GCC}" = xyes; then + crt_file=`$CC --print-file-name=crt1.o 2>/dev/null` + case "$crt_file" in + */*) + CRT_DIR=`$as_dirname -- "$crt_file" || +$as_expr X"$crt_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$crt_file" : 'X\(//\)[^/]' \| \ + X"$crt_file" : 'X\(//\)$' \| \ + X"$crt_file" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$crt_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + ;; + esac + fi + else ## Some platforms don't use any of these files, so it is not @@ -10483,6 +10517,7 @@ fi HAVE_GTK=no +GTK_OBJ= if test "${with_gtk3}" = "yes"; then GLIB_REQUIRED=2.28 GTK_REQUIRED=3.0 @@ -10588,6 +10623,7 @@ $as_echo "no" >&6; } $as_echo "#define HAVE_GTK3 1" >>confdefs.h + GTK_OBJ=emacsgtkfixed.o fi if test "$pkg_check_gtk" != "yes"; then @@ -10697,7 +10733,6 @@ $as_echo "no" >&6; } fi fi -GTK_OBJ= if test x"$pkg_check_gtk" = xyes; then @@ -10726,7 +10761,7 @@ done $as_echo "#define USE_GTK 1" >>confdefs.h - GTK_OBJ=gtkutil.o + GTK_OBJ="gtkutil.o $GTK_OBJ" USE_X_TOOLKIT=none if $PKG_CONFIG --atleast-version=2.10 gtk+-2.0; then : @@ -14974,60 +15009,41 @@ $as_echo "$gl_cv_func_getopt_gnu" >&6; } fi fi -ac_fn_c_check_decl "$LINENO" "getenv" "ac_cv_have_decl_getenv" "$ac_includes_default" -if test "x$ac_cv_have_decl_getenv" = x""yes; then : - ac_have_decl=1 -else - ac_have_decl=0 -fi - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_GETENV $ac_have_decl -_ACEOF + REPLACE_GETOPT=0 if test -n "$gl_replace_getopt"; then : + REPLACE_GETOPT=1 - - GETOPT_H=getopt.h - -$as_echo "#define __GETOPT_PREFIX rpl_" >>confdefs.h - - - - GNULIB_UNISTD_H_GETOPT=1 - - - - - - - - - gl_LIBOBJS="$gl_LIBOBJS getopt.$ac_objext" - - - - - - +fi + if test $REPLACE_GETOPT = 1; then - gl_LIBOBJS="$gl_LIBOBJS getopt1.$ac_objext" - + GETOPT_H=getopt.h +$as_echo "#define __GETOPT_PREFIX rpl_" >>confdefs.h + GNULIB_UNISTD_H_GETOPT=1 + fi +ac_fn_c_check_decl "$LINENO" "getenv" "ac_cv_have_decl_getenv" "$ac_includes_default" +if test "x$ac_cv_have_decl_getenv" = x""yes; then : + ac_have_decl=1 +else + ac_have_decl=0 fi +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_GETENV $ac_have_decl +_ACEOF { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned long long int" >&5 @@ -16034,9 +16050,9 @@ $as_echo "#define GL_TRIGGER_STDC_LIMIT_MACROS 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5 $as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; } -if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then : +if test "${gl_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then : $as_echo_n "(cached) " >&6 else rm -f conftest.sym conftest.file @@ -16046,7 +16062,7 @@ else # When cross-compiling, be pessimistic so we will end up using the # replacement version of lstat that checks for trailing slashes and # calls lstat a second time when necessary. - ac_cv_func_lstat_dereferences_slashed_symlink=no + gl_cv_func_lstat_dereferences_slashed_symlink=no else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -16066,9 +16082,9 @@ struct stat sbuf; } _ACEOF if ac_fn_c_try_run "$LINENO"; then : - ac_cv_func_lstat_dereferences_slashed_symlink=yes + gl_cv_func_lstat_dereferences_slashed_symlink=yes else - ac_cv_func_lstat_dereferences_slashed_symlink=no + gl_cv_func_lstat_dereferences_slashed_symlink=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext @@ -16077,31 +16093,19 @@ fi else # If the 'ln -s' command failed, then we probably don't even # have an lstat function. - ac_cv_func_lstat_dereferences_slashed_symlink=no + gl_cv_func_lstat_dereferences_slashed_symlink=no fi rm -f conftest.sym conftest.file fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5 -$as_echo "$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; } - test $ac_cv_func_lstat_dereferences_slashed_symlink = yes && +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_lstat_dereferences_slashed_symlink" >&5 +$as_echo "$gl_cv_func_lstat_dereferences_slashed_symlink" >&6; } + test $gl_cv_func_lstat_dereferences_slashed_symlink = yes && cat >>confdefs.h <<_ACEOF #define LSTAT_FOLLOWS_SLASHED_SYMLINK 1 _ACEOF - if test "x$ac_cv_func_lstat_dereferences_slashed_symlink" = xno; then - - - - - - - - - gl_LIBOBJS="$gl_LIBOBJS lstat.$ac_objext" - - fi GNULIB_MKTIME=0; @@ -16677,33 +16681,11 @@ fi - - - - - - - gl_LIBOBJS="$gl_LIBOBJS md5.$ac_objext" - - - - : - - - - - - - gl_LIBOBJS="$gl_LIBOBJS sha1.$ac_objext" - - - - : @@ -16713,16 +16695,6 @@ fi - - - - - gl_LIBOBJS="$gl_LIBOBJS filemode.$ac_objext" - - - - - # Persuade glibc to declare getloadavg(). @@ -16730,18 +16702,19 @@ gl_save_LIBS=$LIBS # getloadvg is present in libc on glibc >= 2.2, MacOS X, FreeBSD >= 2.0, # NetBSD >= 0.9, OpenBSD >= 2.0, Solaris >= 7. +HAVE_GETLOADAVG=1 ac_fn_c_check_func "$LINENO" "getloadavg" "ac_cv_func_getloadavg" if test "x$ac_cv_func_getloadavg" = x""yes; then : else - gl_have_func=no + gl_func_getloadavg_done=no # Some systems with -lutil have (and need) -lkvm as well, some do not. # On Solaris, -lkvm requires nlist from -lelf, so check that first # to get the right answer into the cache. # For kstat on solaris, we need to test for libelf and libkvm to force the # definition of SVR4 below. - if test $gl_have_func = no; then + if test $gl_func_getloadavg_done = no; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for elf_begin in -lelf" >&5 $as_echo_n "checking for elf_begin in -lelf... " >&6; } if test "${ac_cv_lib_elf_elf_begin+set}" = set; then : @@ -16860,12 +16833,12 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_getloadavg" >&5 $as_echo "$ac_cv_lib_util_getloadavg" >&6; } if test "x$ac_cv_lib_util_getloadavg" = x""yes; then : - LIBS="-lutil $LIBS" gl_have_func=yes + LIBS="-lutil $LIBS" gl_func_getloadavg_done=yes fi fi - if test $gl_have_func = no; then + if test $gl_func_getloadavg_done = no; then # There is a commonly available library for RS/6000 AIX. # Since it is not a standard part of AIX, it might be installed locally. gl_getloadavg_LIBS=$LIBS @@ -16907,7 +16880,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_getloadavg_getloadavg" >&5 $as_echo "$ac_cv_lib_getloadavg_getloadavg" >&6; } if test "x$ac_cv_lib_getloadavg_getloadavg" = x""yes; then : - LIBS="-lgetloadavg $LIBS" gl_have_func=yes + LIBS="-lgetloadavg $LIBS" gl_func_getloadavg_done=yes else LIBS=$gl_getloadavg_LIBS fi @@ -16915,22 +16888,11 @@ fi fi # Set up the replacement function if necessary. - if test $gl_have_func = no; then - - - - + if test $gl_func_getloadavg_done = no; then + HAVE_GETLOADAVG=0 - - - - gl_LIBOBJS="$gl_LIBOBJS getloadavg.$ac_objext" - - -# Figure out what our getloadavg.c needs. - -# Solaris has libkstat which does not require root. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kstat_open in -lkstat" >&5 + # Solaris has libkstat which does not require root. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kstat_open in -lkstat" >&5 $as_echo_n "checking for kstat_open in -lkstat... " >&6; } if test "${ac_cv_lib_kstat_kstat_open+set}" = set; then : $as_echo_n "(cached) " >&6 @@ -16975,26 +16937,11 @@ _ACEOF fi -test $ac_cv_lib_kstat_kstat_open = yes && gl_have_func=yes + test $ac_cv_lib_kstat_kstat_open = yes && gl_func_getloadavg_done=yes -# On HPUX9, an unprivileged user can get load averages this way. -if test $gl_have_func = no; then - for ac_func in pstat_getdynamic -do : - ac_fn_c_check_func "$LINENO" "pstat_getdynamic" "ac_cv_func_pstat_getdynamic" -if test "x$ac_cv_func_pstat_getdynamic" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_PSTAT_GETDYNAMIC 1 -_ACEOF - gl_have_func=yes -fi -done - -fi - -# AIX has libperfstat which does not require root -if test $gl_have_func = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for perfstat_cpu_total in -lperfstat" >&5 + # AIX has libperfstat which does not require root + if test $gl_func_getloadavg_done = no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for perfstat_cpu_total in -lperfstat" >&5 $as_echo_n "checking for perfstat_cpu_total in -lperfstat... " >&6; } if test "${ac_cv_lib_perfstat_perfstat_cpu_total+set}" = set; then : $as_echo_n "(cached) " >&6 @@ -17039,17 +16986,17 @@ _ACEOF fi - test $ac_cv_lib_perfstat_perfstat_cpu_total = yes && gl_have_func=yes -fi + test $ac_cv_lib_perfstat_perfstat_cpu_total = yes && gl_func_getloadavg_done=yes + fi -if test $gl_have_func = no; then - ac_fn_c_check_header_mongrel "$LINENO" "sys/dg_sys_info.h" "ac_cv_header_sys_dg_sys_info_h" "$ac_includes_default" + if test $gl_func_getloadavg_done = no; then + ac_fn_c_check_header_mongrel "$LINENO" "sys/dg_sys_info.h" "ac_cv_header_sys_dg_sys_info_h" "$ac_includes_default" if test "x$ac_cv_header_sys_dg_sys_info_h" = x""yes; then : - gl_have_func=yes + gl_func_getloadavg_done=yes $as_echo "#define DGUX 1" >>confdefs.h - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dg_sys_info in -ldgc" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dg_sys_info in -ldgc" >&5 $as_echo_n "checking for dg_sys_info in -ldgc... " >&6; } if test "${ac_cv_lib_dgc_dg_sys_info+set}" = set; then : $as_echo_n "(cached) " >&6 @@ -17097,23 +17044,94 @@ fi fi + fi + fi +fi + + +if test "x$gl_save_LIBS" = x; then + GETLOADAVG_LIBS=$LIBS +else + GETLOADAVG_LIBS=`echo "$LIBS" | sed "s!$gl_save_LIBS!!"` +fi +LIBS=$gl_save_LIBS + + +# Test whether the system declares getloadavg. Solaris has the function +# but declares it in , not . +for ac_header in sys/loadavg.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "sys/loadavg.h" "ac_cv_header_sys_loadavg_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_loadavg_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SYS_LOADAVG_H 1 +_ACEOF + +fi + +done + +if test $ac_cv_header_sys_loadavg_h = yes; then + HAVE_SYS_LOADAVG_H=1 +else + HAVE_SYS_LOADAVG_H=0 +fi +ac_fn_c_check_decl "$LINENO" "getloadavg" "ac_cv_have_decl_getloadavg" "#if HAVE_SYS_LOADAVG_H + # include + #endif + #include +" +if test "x$ac_cv_have_decl_getloadavg" = x""yes; then : + +else + HAVE_DECL_GETLOADAVG=0 +fi + + +if test $HAVE_GETLOADAVG = 0; then + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS getloadavg.$ac_objext" + + +# Figure out what our getloadavg.c needs. + +# On HPUX9, an unprivileged user can get load averages this way. +if test $gl_func_getloadavg_done = no; then + for ac_func in pstat_getdynamic +do : + ac_fn_c_check_func "$LINENO" "pstat_getdynamic" "ac_cv_func_pstat_getdynamic" +if test "x$ac_cv_func_pstat_getdynamic" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_PSTAT_GETDYNAMIC 1 +_ACEOF + gl_func_getloadavg_done=yes +fi +done + fi # We cannot check for , because Solaris 2 does not use dwarf (it # uses stabs), but it is still SVR4. We cannot check for because # Irix 4.0.5F has the header but not the library. -if test $gl_have_func = no && test "$ac_cv_lib_elf_elf_begin" = yes \ +if test $gl_func_getloadavg_done = no && test "$ac_cv_lib_elf_elf_begin" = yes \ && test "$ac_cv_lib_kvm_kvm_open" = yes; then - gl_have_func=yes + gl_func_getloadavg_done=yes $as_echo "#define SVR4 1" >>confdefs.h fi -if test $gl_have_func = no; then +if test $gl_func_getloadavg_done = no; then ac_fn_c_check_header_mongrel "$LINENO" "inq_stats/cpustats.h" "ac_cv_header_inq_stats_cpustats_h" "$ac_includes_default" if test "x$ac_cv_header_inq_stats_cpustats_h" = x""yes; then : - gl_have_func=yes + gl_func_getloadavg_done=yes $as_echo "#define UMAX 1" >>confdefs.h @@ -17125,17 +17143,17 @@ fi fi -if test $gl_have_func = no; then +if test $gl_func_getloadavg_done = no; then ac_fn_c_check_header_mongrel "$LINENO" "sys/cpustats.h" "ac_cv_header_sys_cpustats_h" "$ac_includes_default" if test "x$ac_cv_header_sys_cpustats_h" = x""yes; then : - gl_have_func=yes; $as_echo "#define UMAX 1" >>confdefs.h + gl_func_getloadavg_done=yes; $as_echo "#define UMAX 1" >>confdefs.h fi fi -if test $gl_have_func = no; then +if test $gl_func_getloadavg_done = no; then for ac_header in mach/mach.h do : ac_fn_c_check_header_mongrel "$LINENO" "mach/mach.h" "ac_cv_header_mach_mach_h" "$ac_includes_default" @@ -17196,55 +17214,24 @@ fi done - fi fi -if test "x$gl_save_LIBS" = x; then - GETLOADAVG_LIBS=$LIBS -else - GETLOADAVG_LIBS=`echo "$LIBS" | sed "s!$gl_save_LIBS!!"` -fi -LIBS=$gl_save_LIBS -# Test whether the system declares getloadavg. Solaris has the function -# but declares it in , not . -for ac_header in sys/loadavg.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "sys/loadavg.h" "ac_cv_header_sys_loadavg_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_loadavg_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SYS_LOADAVG_H 1 -_ACEOF -fi + GNULIB_GETLOADAVG=1 -done -if test $ac_cv_header_sys_loadavg_h = yes; then - HAVE_SYS_LOADAVG_H=1 -else - HAVE_SYS_LOADAVG_H=0 -fi -ac_fn_c_check_decl "$LINENO" "getloadavg" "ac_cv_have_decl_getloadavg" "#if HAVE_SYS_LOADAVG_H - # include - #endif - #include -" -if test "x$ac_cv_have_decl_getloadavg" = x""yes; then : -else - HAVE_DECL_GETLOADAVG=0 -fi - GNULIB_GETLOADAVG=1 +if test $REPLACE_GETOPT = 1; then @@ -17253,13 +17240,38 @@ fi + gl_LIBOBJS="$gl_LIBOBJS getopt.$ac_objext" + + + + + + gl_LIBOBJS="$gl_LIBOBJS getopt1.$ac_objext" + + + + +fi + + + + + + REPLACE_GETOPT=0 + + if test -n "$gl_replace_getopt"; then : + REPLACE_GETOPT=1 +fi + + + if test $REPLACE_GETOPT = 1; then GETOPT_H=getopt.h @@ -17267,7 +17279,10 @@ $as_echo "#define __GETOPT_PREFIX rpl_" >>confdefs.h - GNULIB_UNISTD_H_GETOPT=1 + GNULIB_UNISTD_H_GETOPT=1 + fi + +if test $REPLACE_GETOPT = 1; then @@ -17291,52 +17306,67 @@ $as_echo "#define __GETOPT_PREFIX rpl_" >>confdefs.h - - fi - - if test $ac_cv_func_lstat = yes; then - if test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then - REPLACE_LSTAT=1 + if test $gl_cv_func_lstat_dereferences_slashed_symlink = no; then + REPLACE_LSTAT=1 fi - # Prerequisites of lib/lstat.c. - else HAVE_LSTAT=0 fi +if test $REPLACE_LSTAT = 1; then - GNULIB_LSTAT=1 + gl_LIBOBJS="$gl_LIBOBJS lstat.$ac_objext" + + : -if test $APPLE_UNIVERSAL_BUILD = 1; then - # A universal build on Apple MacOS X platforms. - # The test result would be 'yes' in 32-bit mode and 'no' in 64-bit mode. - # But we need a configuration result that is valid in both modes. - ac_cv_func_working_mktime=no fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mktime" >&5 + + + + + + GNULIB_LSTAT=1 + + + + + + + + + + + + if test $APPLE_UNIVERSAL_BUILD = 1; then + # A universal build on Apple MacOS X platforms. + # The test result would be 'yes' in 32-bit mode and 'no' in 64-bit mode. + # But we need a configuration result that is valid in both modes. + gl_cv_func_working_mktime=no + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mktime" >&5 $as_echo_n "checking for working mktime... " >&6; } -if test "${ac_cv_func_working_mktime+set}" = set; then : +if test "${gl_cv_func_working_mktime+set}" = set; then : $as_echo_n "(cached) " >&6 else if test "$cross_compiling" = yes; then : - ac_cv_func_working_mktime=no + gl_cv_func_working_mktime=no else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -17533,65 +17563,57 @@ main () } _ACEOF if ac_fn_c_try_run "$LINENO"; then : - ac_cv_func_working_mktime=yes + gl_cv_func_working_mktime=yes else - ac_cv_func_working_mktime=no + gl_cv_func_working_mktime=no fi rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_working_mktime" >&5 -$as_echo "$ac_cv_func_working_mktime" >&6; } -if test $ac_cv_func_working_mktime = no; then - - - - - - - - - gl_LIBOBJS="$gl_LIBOBJS mktime.$ac_objext" fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_mktime" >&5 +$as_echo "$gl_cv_func_working_mktime" >&6; } - if test $ac_cv_func_working_mktime = no; then + if test $gl_cv_func_working_mktime = no; then REPLACE_MKTIME=1 - - - else REPLACE_MKTIME=0 fi +if test $REPLACE_MKTIME = 1; then - GNULIB_MKTIME=1 + gl_LIBOBJS="$gl_LIBOBJS mktime.$ac_objext" + - if test $ac_cv_func_readlink = no; then - HAVE_READLINK=0 +fi + GNULIB_MKTIME=1 - gl_LIBOBJS="$gl_LIBOBJS readlink.$ac_objext" - : + + + + + if test $ac_cv_func_readlink = no; then + HAVE_READLINK=0 else { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether readlink signature is correct" >&5 $as_echo_n "checking whether readlink signature is correct... " >&6; } @@ -17662,7 +17684,12 @@ $as_echo "$gl_cv_func_readlink_works" >&6; } $as_echo "#define READLINK_TRAILING_SLASH_BUG 1" >>confdefs.h REPLACE_READLINK=1 + elif test "$gl_cv_decl_readlink_works" != yes; then + REPLACE_READLINK=1 + fi + fi +if test $HAVE_READLINK = 0 || test $REPLACE_READLINK = 1; then @@ -17670,27 +17697,21 @@ $as_echo "#define READLINK_TRAILING_SLASH_BUG 1" >>confdefs.h - gl_LIBOBJS="$gl_LIBOBJS readlink.$ac_objext" - - elif test "$gl_cv_decl_readlink_works" != yes; then - REPLACE_READLINK=1 - - + gl_LIBOBJS="$gl_LIBOBJS readlink.$ac_objext" + : +fi - gl_LIBOBJS="$gl_LIBOBJS readlink.$ac_objext" - fi - fi + GNULIB_READLINK=1 - GNULIB_READLINK=1 @@ -18229,17 +18250,6 @@ $as_echo "$gl_cv_next_stdlib_h" >&6; } - - - - - - - - - gl_LIBOBJS="$gl_LIBOBJS strftime.$ac_objext" - - # This defines (or not) HAVE_TZNAME and HAVE_TM_ZONE. @@ -18259,31 +18269,30 @@ $as_echo "#define my_strftime nstrftime" >>confdefs.h if test "$ac_cv_have_decl_strtoumax" != yes; then HAVE_DECL_STRTOUMAX=0 + for ac_func in strtoumax +do : + ac_fn_c_check_func "$LINENO" "strtoumax" "ac_cv_func_strtoumax" +if test "x$ac_cv_func_strtoumax" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STRTOUMAX 1 +_ACEOF +fi +done + fi +if test "$ac_cv_have_decl_strtoumax" != yes && test $ac_cv_func_strtoumax = no; then - for ac_func in strtoumax -do : - ac_fn_c_check_func "$LINENO" "strtoumax" "ac_cv_func_strtoumax" -if test "x$ac_cv_func_strtoumax" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_STRTOUMAX 1 -_ACEOF - -else - gl_LIBOBJS="$gl_LIBOBJS $ac_func.$ac_objext" -fi -done + gl_LIBOBJS="$gl_LIBOBJS strtoumax.$ac_objext" - if test $ac_cv_func_strtoumax = no; then ac_fn_c_check_decl "$LINENO" "strtoull" "ac_cv_have_decl_strtoull" "$ac_includes_default" if test "x$ac_cv_have_decl_strtoull" = x""yes; then : @@ -18298,20 +18307,13 @@ _ACEOF - fi - fi - - - - - GNULIB_STRTOUMAX=1 +fi - if test $ac_cv_func_symlink = no; then - HAVE_SYMLINK=0 + GNULIB_STRTOUMAX=1 @@ -18319,9 +18321,8 @@ _ACEOF - - gl_LIBOBJS="$gl_LIBOBJS symlink.$ac_objext" - + if test $ac_cv_func_symlink = no; then + HAVE_SYMLINK=0 else { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether symlink handles trailing slash correctly" >&5 $as_echo_n "checking whether symlink handles trailing slash correctly... " >&6; } @@ -18366,6 +18367,10 @@ fi $as_echo "$gl_cv_func_symlink_works" >&6; } if test "$gl_cv_func_symlink_works" != yes; then REPLACE_SYMLINK=1 + fi + fi + +if test $HAVE_SYMLINK = 0 || test $REPLACE_SYMLINK = 1; then @@ -18376,13 +18381,15 @@ $as_echo "$gl_cv_func_symlink_works" >&6; } gl_LIBOBJS="$gl_LIBOBJS symlink.$ac_objext" - fi - fi +fi + + + + GNULIB_SYMLINK=1 - GNULIB_SYMLINK=1 @@ -18528,7 +18535,8 @@ $as_echo "$gl_cv_time_r_posix" >&6; } else HAVE_LOCALTIME_R=0 fi - if test $HAVE_LOCALTIME_R = 0 || test $REPLACE_LOCALTIME_R = 1; then + +if test $HAVE_LOCALTIME_R = 0 || test $REPLACE_LOCALTIME_R = 1; then @@ -18542,12 +18550,15 @@ $as_echo "$gl_cv_time_r_posix" >&6; } : - fi +fi + + + + GNULIB_TIME_R=1 - GNULIB_TIME_R=1 @@ -18743,7 +18754,8 @@ $as_echo "#define REPLACE_FUNC_STAT_DIR 1" >>confdefs.h $as_echo "#define REPLACE_FUNC_STAT_FILE 1" >>confdefs.h ;; esac - if test $REPLACE_STAT = 1; then + +if test $REPLACE_STAT = 1; then @@ -18755,12 +18767,18 @@ $as_echo "#define REPLACE_FUNC_STAT_FILE 1" >>confdefs.h gl_LIBOBJS="$gl_LIBOBJS stat.$ac_objext" - fi + + : + +fi + - GNULIB_STAT=1 + GNULIB_STAT=1 + + @@ -18777,15 +18795,7 @@ $as_echo "#define REPLACE_FUNC_STAT_FILE 1" >>confdefs.h if test "$ac_cv_type_unsigned_long_long_int" = yes; then - - - - - - - - - for ac_func in strtoull + for ac_func in strtoull do : ac_fn_c_check_func "$LINENO" "strtoull" "ac_cv_func_strtoull" if test "x$ac_cv_func_strtoull" = x""yes; then : @@ -18793,26 +18803,37 @@ if test "x$ac_cv_func_strtoull" = x""yes; then : #define HAVE_STRTOULL 1 _ACEOF -else - - gl_LIBOBJS="$gl_LIBOBJS $ac_func.$ac_objext" - fi done - if test $ac_cv_func_strtoull = no; then HAVE_STRTOULL=0 + fi + fi + +if test $HAVE_STRTOULL = 0; then + + + + + + + + + gl_LIBOBJS="$gl_LIBOBJS strtoull.$ac_objext" + : - fi - fi +fi + + + + GNULIB_STRTOULL=1 - GNULIB_STRTOULL=1 @@ -18825,7 +18846,7 @@ done gl_gnulib_enabled_verify=true fi } - if test $GNULIB_UNISTD_H_GETOPT = 1; then + if test $REPLACE_GETOPT = 1; then func_gl_gnulib_m4code_be453cec5eecf5731a274f2de7f2db36 fi if test $REPLACE_LSTAT = 1; then