comparison configure.in @ 94119:5b10e5646973

* 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.

94118:75036e17da20

  AC_DEFINE(HESIOD, 1, [Define to support using a Hesiod database to find the POP server.])
fi

OPTION_DEFAULT_ON([sound],[don't compile with sound support])

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
dnl keep them together visually.
AC_ARG_WITH([x-toolkit],[AS_HELP_STRING([--with-x-toolkit=KIT],

## Enabled by default.
AC_ARG_ENABLE(font-backend,
[AS_HELP_STRING([--disable-font-backend],[don't compile font-backend support])],
      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,
      USE_XASSERTS=no)

    if test "$USE_X_TOOLKIT" != "maybe"; then
      AC_MSG_ERROR([Gtk+ wanted, but it does not compile, see config.log.  Maybe some x11-devel files missing?]);
    fi
  else
    HAVE_GTK=yes
    AC_DEFINE(HAVE_GTK, 1, [Define to 1 if using GTK.])
    USE_X_TOOLKIT=none
    if $PKG_CONFIG --atleast-version=2.10 gtk+-2.0; then
      :
    else
      AC_MSG_WARN([[Your version of Gtk+ will have problems with

if test $USE_XASSERTS = yes; then
   echo "  Compiling with asserts turned on."
   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
  case "$canonical" in
  *cygwin*)

94119:5b10e5646973

  AC_DEFINE(HESIOD, 1, [Define to support using a Hesiod database to find the POP server.])
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
dnl keep them together visually.
AC_ARG_WITH([x-toolkit],[AS_HELP_STRING([--with-x-toolkit=KIT],

## Enabled by default.
AC_ARG_ENABLE(font-backend,
[AS_HELP_STRING([--disable-font-backend],[don't compile font-backend support])],
      USE_FONT_BACKEND=$enableval,
      USE_FONT_BACKEND=yes)

AC_ARG_ENABLE(asserts,
[AS_HELP_STRING([--enable-asserts], [compile code with asserts enabled])],
      USE_XASSERTS=$enableval,
      USE_XASSERTS=no)

    if test "$USE_X_TOOLKIT" != "maybe"; then
      AC_MSG_ERROR([Gtk+ wanted, but it does not compile, see config.log.  Maybe some x11-devel files missing?]);
    fi
  else
    HAVE_GTK=yes
    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
      :
    else
      AC_MSG_WARN([[Your version of Gtk+ will have problems with

if test $USE_XASSERTS = yes; then
   echo "  Compiling with asserts turned on."
   CPPFLAGS="$CPPFLAGS -DXASSERTS=1"
fi

echo

if test "$USE_X_TOOLKIT" = GTK; then
  case "$canonical" in
  *cygwin*)