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

[Glenn Morris]

------------------------------------------------------------
revno: 105405
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2011-08-05 06:18:28 -0400
message:
  Auto-commit of generated files.
modified:
  autogen/Makefile.in
  autogen/config.in
  autogen/configure

=== modified file 'autogen/Makefile.in'
--- a/autogen/Makefile.in       2011-07-09 10:18:57 +0000
+++ b/autogen/Makefile.in       2011-08-05 10:18:28 +0000
@@ -495,6 +495,7 @@
 LIBX_OTHER = @LIBX_OTHER@
 LIB_GCC = @LIB_GCC@
 LIB_MATH = @LIB_MATH@
+LIB_PTHREAD = @LIB_PTHREAD@
 LIB_PTHREAD_SIGMASK = @LIB_PTHREAD_SIGMASK@
 LIB_STANDARD = @LIB_STANDARD@
 LTLIBINTL = @LTLIBINTL@

=== modified file 'autogen/config.in'
--- a/autogen/config.in 2011-07-28 10:18:13 +0000
+++ b/autogen/config.in 2011-08-05 10:18:28 +0000
@@ -321,9 +321,6 @@
 /* Define to 1 if you have the `gtk_adjustment_get_page_size' function. */
 #undef HAVE_GTK_ADJUSTMENT_GET_PAGE_SIZE
 
-/* Define to 1 if you have GTK and pthread (-lpthread). */
-#undef HAVE_GTK_AND_PTHREAD
-
 /* Define to 1 if you have the `gtk_dialog_get_action_area' function. */
 #undef HAVE_GTK_DIALOG_GET_ACTION_AREA
 
@@ -582,6 +579,9 @@
 /* Define to 1 if you have the `pstat_getdynamic' function. */
 #undef HAVE_PSTAT_GETDYNAMIC
 
+/* Define to 1 if you have pthread (-lpthread). */
+#undef HAVE_PTHREAD
+
 /* Define to 1 if you have the <pthread.h> header file. */
 #undef HAVE_PTHREAD_H
 

=== modified file 'autogen/configure'
--- a/autogen/configure 2011-07-29 10:18:43 +0000
+++ b/autogen/configure 2011-08-05 10:18:28 +0000
@@ -1139,6 +1139,7 @@
 IMAGEMAGICK_CFLAGS
 RSVG_LIBS
 RSVG_CFLAGS
+LIB_PTHREAD
 VMLIMIT_OBJ
 GMALLOC_OBJ
 HAVE_XSERVER
@@ -9949,6 +9950,72 @@
 fi
 
 
+LIB_PTHREAD=
+for ac_header in pthread.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" 
"$ac_includes_default"
+if test "x$ac_cv_header_pthread_h" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_PTHREAD_H 1
+_ACEOF
+
+fi
+
+done
+
+if test "$ac_cv_header_pthread_h"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_self in 
-lpthread" >&5
+$as_echo_n "checking for pthread_self in -lpthread... " >&6; }
+if test "${ac_cv_lib_pthread_pthread_self+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lpthread  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char pthread_self ();
+int
+main ()
+{
+return pthread_self ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_pthread_pthread_self=yes
+else
+  ac_cv_lib_pthread_pthread_self=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 
$ac_cv_lib_pthread_pthread_self" >&5
+$as_echo "$ac_cv_lib_pthread_pthread_self" >&6; }
+if test "x$ac_cv_lib_pthread_pthread_self" = x""yes; then :
+  HAVE_PTHREAD=yes
+fi
+
+fi
+if test "$HAVE_PTHREAD" = yes; then
+  case "${canonical}" in
+    *-hpux*) ;;
+    *) LIB_PTHREAD="-lpthread" ;;
+  esac
+
+$as_echo "#define HAVE_PTHREAD 1" >>confdefs.h
+
+fi
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cma_open in -lpthreads" 
>&5
 $as_echo_n "checking for cma_open in -lpthreads... " >&6; }
 if test "${ac_cv_lib_pthreads_cma_open+set}" = set; then :
@@ -10774,70 +10841,6 @@
 
   fi
 
-        HAVE_GTK_AND_PTHREAD=no
-    for ac_header in pthread.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" 
"$ac_includes_default"
-if test "x$ac_cv_header_pthread_h" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_PTHREAD_H 1
-_ACEOF
-
-fi
-
-done
-
-    if test "$ac_cv_header_pthread_h"; then
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_self in 
-lpthread" >&5
-$as_echo_n "checking for pthread_self in -lpthread... " >&6; }
-if test "${ac_cv_lib_pthread_pthread_self+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char pthread_self ();
-int
-main ()
-{
-return pthread_self ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_pthread_pthread_self=yes
-else
-  ac_cv_lib_pthread_pthread_self=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: 
$ac_cv_lib_pthread_pthread_self" >&5
-$as_echo "$ac_cv_lib_pthread_pthread_self" >&6; }
-if test "x$ac_cv_lib_pthread_pthread_self" = x""yes; then :
-  HAVE_GTK_AND_PTHREAD=yes
-fi
-
-    fi
-    if test "$HAVE_GTK_AND_PTHREAD" = yes; then
-      case "${canonical}" in
-        *-hpux*) ;;
-        *) GTK_LIBS="$GTK_LIBS -lpthread" ;;
-      esac
-
-$as_echo "#define HAVE_GTK_AND_PTHREAD 1" >>confdefs.h
-
-    fi
 
     for ac_func in gtk_widget_get_window gtk_widget_set_has_window \
                  gtk_dialog_get_action_area gtk_widget_get_sensitive \