gnome-games r8211 - in trunk: . blackjack/src
- From: chpe svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-games r8211 - in trunk: . blackjack/src
- Date: Tue, 28 Oct 2008 13:38:22 +0000 (UTC)
Author: chpe
Date: Tue Oct 28 13:38:22 2008
New Revision: 8211
URL: http://svn.gnome.org/viewvc/gnome-games?rev=8211&view=rev
Log:
All games allow gtk-only now; remove unneeded need_gnome and
allow_gtk_only flags.
Move libxml check out of the GNOME check, since it's only used by
blackjack.
Modified:
trunk/blackjack/src/Makefile.am
trunk/configure.in
Modified: trunk/blackjack/src/Makefile.am
==============================================================================
--- trunk/blackjack/src/Makefile.am (original)
+++ trunk/blackjack/src/Makefile.am Tue Oct 28 13:38:22 2008
@@ -5,6 +5,7 @@
-DDATADIR=\""$(pkgdatadir)"\" \
-DHAVE_GNOME \
$(GNOME_GAMES_CXXFLAGS) \
+ $(XML_CFLAGS) \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
bin_PROGRAMS = blackjack
@@ -41,5 +42,5 @@
blackjack_LDADD = \
../../libgames-support/libgames-support.la \
- $(GNOME_GAMES_LIBS) -lz
+ $(GNOME_GAMES_LIBS) $(XML_LIBS) -lz
Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in (original)
+++ trunk/configure.in Tue Oct 28 13:38:22 2008
@@ -108,14 +108,13 @@
need_ggz=no
need_rsvg=no
need_guile=no
-need_gnome=no
need_python=no
+need_libxml=no
need_clutter=no
want_gstreamer=no
allow_gnuchess=no
allow_smclient=no
disallow_hildon=no
-disallow_gtk_only=no
for game in $gamelist; do
case $game in
@@ -143,12 +142,6 @@
*) ;;
esac
case $game in
- aisleriot|glines|gnotravex|gnotski|gtali|mahjongg|same-gnome) ;;
- *) need_gnome=yes
- disallow_gtk_only=yes
- ;;
- esac
- case $game in
aisleriot) ;;
*) disallow_hildon=yes ;;
esac
@@ -161,6 +154,10 @@
*) ;;
esac
case $game in
+ blackjack) need_libxml=yes ;;
+ *) ;;
+ esac
+ case $game in
no-game-yet) need_clutter=yes ;;
*) ;;
esac
@@ -250,9 +247,6 @@
if test "$with_platform" = "hildon" -a "$disallow_hildon" = "yes"; then
AC_MSG_ERROR([Trying to build with Hildon platform, but some of the following games don't support this: $gamelist])
fi
-if test "$with_platform" = "gtk-only" -a "$disallow_gtk_only" = "yes"; then
- AC_MSG_ERROR([Trying to build with gtk-only platform, but some of the following games don't support this: $gamelist])
-fi
AM_CONDITIONAL([HAVE_GNOME],[test "$with_platform" = "gnome"])
AM_CONDITIONAL([HAVE_HILDON],[test "$with_platform" = "hildon"])
@@ -376,12 +370,18 @@
AM_GCONF_SOURCE_2
AC_PATH_PROG([GCONFTOOL],[gconftool-2])
+# Check for libXML2
+
+if test "$need_libxml" = "yes"; then
+ PKG_CHECK_MODULES([XML],[libxml-2.0 >= $LIBXML_REQUIRED])
+ AC_SUBST([XML_CFLAGS])
+ AC_SUBST([XML_LIBS])
+fi
+
# Check for GNOME modules
if test "$with_platform" = "gnome"; then
- PKG_CHECK_MODULES([GNOME],[
- libxml-2.0 >= $LIBXML_REQUIRED
- gconf-2.0 >= $GCONF_REQUIRED])
+ PKG_CHECK_MODULES([GNOME],[gconf-2.0 >= $GCONF_REQUIRED])
AC_SUBST([GNOME_CFLAGS])
AC_SUBST([GNOME_LIBS])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]