tTest for GTK2.0/1.2 _before_ the GLib test. This way we can build properly if GLib2.0 is installed but GTK+2.0 is not. (The reverse situation with GTK+2.0 and GLib1.2 should not occur on a properly set up system, as GTK+2.0 equires GLib2.0.) - 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 d81c16d5d84ac841b462b1060e4feb11de3c778e
(DIR) parent 9d3e8bbb511882cdd0e27893b74f0bae7e3e99a2
(HTM) Author: Ben Webb <ben@salilab.org>
Date: Fri, 21 Jun 2002 11:46:23 +0000
Test for GTK2.0/1.2 _before_ the GLib test. This way we can build properly
if GLib2.0 is installed but GTK+2.0 is not. (The reverse situation with GTK+2.0
and GLib1.2 should not occur on a properly set up system, as GTK+2.0
equires GLib2.0.)
Diffstat:
M ChangeLog | 2 ++
M configure.in | 32 ++++++++++++++-----------------
2 files changed, 16 insertions(+), 18 deletions(-)
---
(DIR) diff --git a/ChangeLog b/ChangeLog
t@@ -9,6 +9,8 @@ cvs
- Bug fix: when the buttons in the Fight dialog are not visible to a
mouse user, previously you were able to access them via. the keyboard
shortcuts; now fixed.
+ - configure should now work properly if GLib 2.0 is installed but
+ GTK2.0 is not
1.5.6 29-04-2002
- Bug fix: the server will only let you pay back loans or deal with the
(DIR) diff --git a/configure.in b/configure.in
t@@ -93,17 +93,6 @@ if test "$CYGWIN" = "yes" ; then
else
AC_MSG_RESULT([Configuring for Unix binary])
- dnl We NEED glib - so test for it first
- glib2_found="no"
- if test "$USE_GLIB2" = "yes" ; then
- AM_PATH_GLIB_2_0(2.0.0, glib2_found="yes")
- fi
- if test "$glib2_found" = "no" ; then
- AM_PATH_GLIB(1.2.0, , [AC_MSG_ERROR(Cannot find glib - aborting)])
- else
- AC_DEFINE(HAVE_GLIB2, 1, [Do we have GLIB 2.0 ?])
- fi
-
dnl On true Unix systems, test for valid curses-like libraries
if test "$CURSES_CLIENT" != "no" ; then
AC_CHECK_LIB(ncurses,newterm)
t@@ -123,20 +112,16 @@ else
fi
fi
+ gtk2_found="probe"
if test "$GUI_CLIENT" != "no" -o "$GUI_SERVER" != "no"; then
- dnl Tests for GTK; N.B. bad things will happen if we use GTK+2 but
- dnl GLIB1, or vice versa, so we try to stop that from happening.
- gtk2_found="no"
if test "$USE_GLIB2" = "yes" ; then
- AM_PATH_GTK_2_0(2.0.0,gtk2_found="yes")
+ AM_PATH_GTK_2_0(2.0.0,gtk2_found="yes",gtk2_found="no")
fi
if test "$gtk2_found" = "yes" ; then
HAVE_FIXED_GTK="yes"
else
gtk_found="no"
- if test "$glib2_found" = "no" ; then
- AM_PATH_GTK(1.2.0,gtk_found="yes")
- fi
+ AM_PATH_GTK(1.2.0,gtk_found="yes")
if test "$gtk_found" = "no" ; then
if test "$GUI_CLIENT" = "yes" -o "$GUI_SERVER" = "yes" ; then
AC_MSG_ERROR(Cannot find GTK+)
t@@ -164,6 +149,17 @@ else
fi
fi
+ dnl We NEED glib; N.B. don't link against glib2 if we're using GTK+1
+ glib2_found="no"
+ if test "$USE_GLIB2" = "yes" -a "$gtk2_found" != "no"; then
+ AM_PATH_GLIB_2_0(2.0.0, glib2_found="yes")
+ fi
+ if test "$glib2_found" = "no" ; then
+ AM_PATH_GLIB(1.2.0, , [AC_MSG_ERROR(Cannot find glib - aborting)])
+ else
+ AC_DEFINE(HAVE_GLIB2, 1, [Do we have GLIB 2.0 ?])
+ fi
+
dnl Add esound support if available
ESD=no
AM_PATH_ESD(0.0.20, ESD=yes)