* configure.in (SYNC_INPUT): Use OPTION_DEFAULT_ON and AC_DEFINE

rather than change CPPFLAGS.
(HAVE_GTK): Rename to USE_GTK.
* Makefile.in: Don't use HAVE_GTK and don't -DUSE_GTK since it's now
done in config.h.

3 files changed, 35 insertions, 11 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b814ed3e57f..dd0d8cd266f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * Makefile.in: Don't use HAVE_GTK and don't -DUSE_GTK since it's now
+        done in config.h.
+
 2008-04-16  Juanma Barranquero  <lekktu@gmail.com>
 
         * character.c (Fchar_bytes, Fchar_width, Fstring_width)
diff --git a/src/Makefile.in b/src/Makefile.in
index 4ed0b19ed5f..8566848a434 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -240,11 +240,6 @@ STARTFILES = START_FILES
 #endif /* not ORDINARY_LINK */
 
 
-#if HAVE_GTK
-#define USE_GTK
-TOOLKIT_DEFINES = -DUSE_GTK
-#endif
-
 #ifdef USE_X_TOOLKIT
 #define USE_@X_TOOLKIT_TYPE@
 TOOLKIT_DEFINES = -DUSE_@X_TOOLKIT_TYPE@
@@ -980,7 +975,7 @@ temacs${EXEEXT}: $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} OBJ
 prefix-args${EXEEXT}: prefix-args.c $(config_h)
         $(CC) $(ALL_CFLAGS) $(LDFLAGS) ${srcdir}/prefix-args.c -o prefix-args
 
-#if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS) && ! defined (HAVE_GTK)
+#if defined (HAVE_X_WINDOWS) && defined (HAVE_X11) && defined (HAVE_MENUS) && ! defined (USE_GTK)
 
 /* We use stamp-xmenu with these two deps
    to both ensure that lwlib gets remade based on its dependencies
@@ -1029,12 +1024,12 @@ really-oldXMenu:
         @true  /* make -t should not create really-oldXMenu.  */
 .PHONY: really-oldXMenu
 #endif /* not USE_X_TOOLKIT */
-#else /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS && ! HAVE_GTK) */
+#else /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS && ! USE_GTK) */
 
 /* We don''t really need this, but satisfy the dependency.  */
 stamp-oldxmenu:
         touch stamp-oldxmenu
-#endif /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS && ! HAVE_GTK) */
+#endif /* not (HAVE_X_WINDOWS && HAVE_X11 && HAVE_MENUS && ! USE_GTK) */
 
 ../config.status:: epaths.in
         @echo "The file epaths.h needs to be set up from epaths.in."
diff --git a/src/config.in b/src/config.in
index 83e58b0a401..b3fefc18853 100644
--- a/src/config.in
+++ b/src/config.in
@@ -244,9 +244,6 @@ Boston, MA 02110-1301, USA.  */
 /* Define to 1 if you have the `grantpt' function. */
 #undef HAVE_GRANTPT
 
-/* Define to 1 if using GTK. */
-#undef HAVE_GTK
-
 /* Define to 1 if you have GTK and pthread (-lpthread). */
 #undef HAVE_GTK_AND_PTHREAD
 
@@ -837,6 +834,9 @@ Boston, MA 02110-1301, USA.  */
 /* Define to 1 on System V Release 4. */
 #undef SVR4
 
+/* Process async input synchronously. */
+#undef SYNC_INPUT
+
 /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
 #undef TIME_WITH_SYS_TIME
 
@@ -856,6 +856,9 @@ Boston, MA 02110-1301, USA.  */
 /* Define to 1 if we should use font-backend. */
 #undef USE_FONT_BACKEND
 
+/* Define to 1 if using GTK. */
+#undef USE_GTK
+
 /* Define to 1 if we should use toolkit scroll bars. */
 #undef USE_TOOLKIT_SCROLL_BARS
 
@@ -890,6 +893,27 @@ Boston, MA 02110-1301, USA.  */
 /* Define for large files, on AIX-style hosts. */
 #undef _LARGE_FILES
 
+/* Define to 1 if on MINIX. */
+#undef _MINIX
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+   this defined. */
+#undef _POSIX_1_SOURCE
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+#undef _POSIX_SOURCE
+
+/* Enable extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+
 /* Define to rpl_ if the getopt replacement functions and variables should be
    used. */
 #undef __GETOPT_PREFIX