Commit a51f4969 authored by Stefan Monnier's avatar Stefan Monnier
Browse files

* 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.
parent 7316a2b5
2008-04-16 Stefan Monnier <monnier@iro.umontreal.ca>
* configure.in (SYNC_INPUT): Use OPTION_DEFAULT_ON and AC_DEFINE
rather than change CPPFLAGS.
(HAVE_GTK): Rename to USE_GTK.
2008-04-16 Yavor Doganov <yavor@gnu.org> (tiny change)
* configure.in: Replace the obsolete macros AC_AIX and
......
This diff is collapsed.
......@@ -99,6 +99,11 @@ fi
OPTION_DEFAULT_ON([sound],[don't compile with sound support])
OPTION_DEFAULT_ON([sync-input],[Process async input synchronously])
if test "$with_sync_input" = yes; then
AC_DEFINE(SYNC_INPUT, 1, [Process async input synchronously.])
fi
dnl FIXME currently it is not the last.
dnl This should be the last --with option, because --with-x is
dnl added later on when we find the path of X, and it's best to
......@@ -173,12 +178,6 @@ AC_ARG_ENABLE(font-backend,
USE_FONT_BACKEND=$enableval,
USE_FONT_BACKEND=yes)
## Enabled by default.
AC_ARG_ENABLE(sync-input,
[AS_HELP_STRING([--disable-sync-input], [don't compile code with sync-input])],
USE_SYNC_INPUT=$enableval,
USE_SYNC_INPUT=yes)
AC_ARG_ENABLE(asserts,
[AS_HELP_STRING([--enable-asserts], [compile code with asserts enabled])],
USE_XASSERTS=$enableval,
......@@ -1670,7 +1669,7 @@ if test x"$pkg_check_gtk" = xyes; then
fi
else
HAVE_GTK=yes
AC_DEFINE(HAVE_GTK, 1, [Define to 1 if using GTK.])
AC_DEFINE(USE_GTK, 1, [Define to 1 if using GTK.])
USE_X_TOOLKIT=none
if $PKG_CONFIG --atleast-version=2.10 gtk+-2.0; then
:
......@@ -3008,11 +3007,6 @@ if test $USE_XASSERTS = yes; then
CPPFLAGS="$CPPFLAGS -DXASSERTS=1"
fi
if test $USE_SYNC_INPUT = yes; then
echo " Compiling with sync input."
CPPFLAGS="$CPPFLAGS -DSYNC_INPUT=1"
fi
echo
if test "$USE_X_TOOLKIT" = GTK; then
......
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)
......
......@@ -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."
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment