tReplaced AM_CONDITIONAL with AC_SUBST to placate automake-1.5. - vaccinewars - be a doctor and try to vaccinate the world
(HTM) git clone git://src.adamsgaard.dk/vaccinewars
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit b9e60d7f50feda9224d64c0266ce2d6661e04fe4
(DIR) parent bd85841c07366d06de4227c37fcf25bc69ca9be4
(HTM) Author: Ben Webb <ben@salilab.org>
Date: Sat, 20 Apr 2002 17:53:26 +0000
Replaced AM_CONDITIONAL with AC_SUBST to placate automake-1.5.
Diffstat:
M configure.in | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
---
(DIR) diff --git a/configure.in b/configure.in
t@@ -57,7 +57,7 @@ AC_ARG_ENABLE(nativewin32,
[ CYGWIN="$enableval" ])
if test "$CYGWIN" = "yes" ; then
- AC_MSG_RESULT("Configuring for native Win32 binary under Cygwin")
+ AC_MSG_RESULT([Configuring for native Win32 binary under Cygwin])
AC_DEFINE(CYGWIN)
dnl We NEED GLib, but glib-config is not usually installed under Cygwin
t@@ -86,7 +86,7 @@ if test "$CYGWIN" = "yes" ; then
GUI_SERVER="yes"
fi
else
- AC_MSG_RESULT("Configuring for Unix binary")
+ AC_MSG_RESULT([Configuring for Unix binary])
dnl We NEED glib - so test for it first
glib2_found="no"
t@@ -154,7 +154,7 @@ else
HAVE_FIXED_GTK="yes"
fi
fi
- AC_MSG_RESULT("$HAVE_FIXED_GTK")
+ AC_MSG_RESULT([$HAVE_FIXED_GTK])
fi
fi
fi
t@@ -267,13 +267,29 @@ CFLAGS="$CFLAGS -DDATADIR=\\\"${datadir}\\\""
dnl Add in the required clients
AM_CONDITIONAL(GUI_CLIENT, test "$GUI_CLIENT" = "yes")
+if test "$GUI_CLIENT" = "yes" ; then
+ GUILIB="gui_client/libguiclient.a"
+ AC_SUBST(GUILIB)
+fi
AM_CONDITIONAL(CURSES_CLIENT, test "$CURSES_CLIENT" = "yes")
+if test "$CURSES_CLIENT" = "yes" ; then
+ CURSESLIB="curses_client/libcursesclient.a"
+ AC_SUBST(CURSESLIB)
+fi
dnl Compile in the gtkport stuff for any kind of GUI
AM_CONDITIONAL(GTKPORT, test "$GUI_CLIENT" = "yes" -o "$GUI_SERVER" = "yes")
+if test "$GUI_CLIENT" = "yes" -o "$GUI_SERVER" = "yes" ; then
+ GTKPORTLIB="gtkport/libgtkport.a"
+ AC_SUBST(GTKPORTLIB)
+fi
dnl Compile in the cursesport stuff for the curses client only
AM_CONDITIONAL(CURSESPORT, test "$CURSES_CLIENT" = "yes")
+if test "$CURSES_CLIENT" = "yes" ; then
+ CURSESPORTLIB="cursesport/libcursesport.a"
+ AC_SUBST(CURSESPORTLIB)
+fi
AC_OUTPUT([
Makefile