Auto-commit of generated files.

2 files changed, 35 insertions, 14 deletions

diff --git a/autogen/config.in b/autogen/config.in
index 56d59da131a..94185b160ca 100644
--- a/autogen/config.in
+++ b/autogen/config.in
@@ -590,9 +590,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the `gtk_handle_box_new' function. */
 #undef HAVE_GTK_HANDLE_BOX_NEW
 
-/* Define to 1 if you have the `gtk_main' function. */
-#undef HAVE_GTK_MAIN
-
 /* Define to 1 if you have the `gtk_orientable_set_orientation' function. */
 #undef HAVE_GTK_ORIENTABLE_SET_ORIENTATION
 
@@ -1703,7 +1700,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
      && !defined __APPLE__)
 # define _GL_INLINE inline
 # define _GL_EXTERN_INLINE extern inline
-#elif 2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __APPLE__
+#elif (2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __STRICT_ANSI__ \
+       && !defined __APPLE__)
 # if __GNUC_GNU_INLINE__
    /* __gnu_inline__ suppresses a GCC 4.2 diagnostic.  */
 #  define _GL_INLINE extern inline __attribute__ ((__gnu_inline__))
diff --git a/autogen/configure b/autogen/configure
index 4e53f52e0b6..4feb8ace937 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -11455,18 +11455,41 @@ if test x"$pkg_check_gtk" = xyes; then
   C_SWITCH_X_SITE="$C_SWITCH_X_SITE $GTK_CFLAGS"
   CFLAGS="$CFLAGS $GTK_CFLAGS"
   LIBS="$GTK_LIBS $LIBS"
-    GTK_COMPILES=no
-  for ac_func in gtk_main
-do :
-  ac_fn_c_check_func "$LINENO" "gtk_main" "ac_cv_func_gtk_main"
-if test "x$ac_cv_func_gtk_main" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_GTK_MAIN 1
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether GTK compiles" >&5
+$as_echo_n "checking whether GTK compiles... " >&6; }
+  GTK_COMPILES=no
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+/* Check the Gtk and Glib APIs.  */
+         #include <gtk/gtk.h>
+         #include <glib-object.h>
+         static void
+         callback (GObject *go, GParamSpec *spec, gpointer user_data)
+         {}
+
+int
+main ()
+{
+
+         GtkSettings *gs = 0;
+         /* Use G_CALLBACK to make sure function pointers can be cast to void *;
+            strict C prohibits this.  Use gtk_main_iteration to test that the
+            libraries are there.  */
+         if (g_signal_handler_find (G_OBJECT (gs), G_SIGNAL_MATCH_FUNC,
+                                    0, 0, 0, G_CALLBACK (callback), 0))
+           gtk_main_iteration ();
+
+  ;
+  return 0;
+}
 _ACEOF
- GTK_COMPILES=yes
+if ac_fn_c_try_link "$LINENO"; then :
+  GTK_COMPILES=yes
 fi
-done
-
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_COMPILES" >&5
+$as_echo "$GTK_COMPILES" >&6; }
   if test "${GTK_COMPILES}" != "yes"; then
     GTK_OBJ=
     if test "$USE_X_TOOLKIT" != "maybe"; then