[Emacs-diffs] /srv/bzr/emacs/trunk r104635: Auto-commit of generated files.

[Glenn Morris]

------------------------------------------------------------
revno: 104635
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2011-06-19 14:33:17 -0400
message:
  Auto-commit of generated files.
modified:
  autogen/configure

=== modified file 'autogen/configure'
--- a/autogen/configure 2011-06-17 17:41:21 +0000
+++ b/autogen/configure 2011-06-19 18:33:17 +0000
@@ -16707,14 +16707,14 @@
 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 :
@@ -16833,12 +16833,12 @@
 { $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
@@ -16880,7 +16880,7 @@
 { $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
@@ -16888,67 +16888,11 @@
    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
-   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 <sys/loadavg.h>, not <stdlib.h>.
-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 <sys/loadavg.h>
-   #endif
-   #include <stdlib.h>
-"
-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.
-
-# 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
@@ -16993,26 +16937,11 @@
 
 fi
 
-test $ac_cv_lib_kstat_kstat_open = yes && gl_have_func=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
+     test $ac_cv_lib_kstat_kstat_open = yes && gl_func_getloadavg_done=yes
+
+     # 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
@@ -17057,17 +16986,17 @@
 
 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
@@ -17115,23 +17044,94 @@
 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 <sys/loadavg.h>, not <stdlib.h>.
+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 <sys/loadavg.h>
+   #endif
+   #include <stdlib.h>
+"
+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 <dwarf.h>, because Solaris 2 does not use dwarf (it
 # uses stabs), but it is still SVR4.  We cannot check for <elf.h> 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
 
@@ -17143,17 +17143,17 @@
 
 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
-
-fi
-
-
-fi
-
-if test $gl_have_func = no; then
+  gl_func_getloadavg_done=yes; $as_echo "#define UMAX 1" >>confdefs.h
+
+fi
+
+
+fi
+
+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"