* Make compilation of QuesoGLC optional (i.e. add a --disable-quesoglc to the configure script)

* Disable compiling of QuesoGLC when creating a Debian package


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2728 4a71c877-e1ca-e34f-864e-861f7616d084

configure.ac

@@ -8,9 +8,18 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([lib/framework/frame.c])
 
 
-if test -d "${srcdir}/3rdparty/quesoglc" ; then
-	AC_CONFIG_SUBDIRS([3rdparty/quesoglc])
-	QUESOGLC_SUBDIR=3rdparty/quesoglc
+AC_ARG_ENABLE(quesoglc,
+	AS_HELP_STRING([--disable-quesoglc], [Compile QuesoGLC [yes]]),
+	[ enable_quesoglc=${enableval} ], [ enable_quesoglc=yes ])
+AC_MSG_CHECKING([whether to compile QuesoGLC])
+AC_MSG_RESULT([${enable_quesoglc}])
+if test "x$enable_quesoglc" = "xyes" ; then
+	if test -d "${srcdir}/3rdparty/quesoglc" ; then
+		AC_CONFIG_SUBDIRS([3rdparty/quesoglc])
+		QUESOGLC_SUBDIR=3rdparty/quesoglc
+	else
+		QUESOGLC_SUBDIR=
+	fi
 else
 	QUESOGLC_SUBDIR=
 fi

debian/changelog

@@ -1,10 +1,11 @@
-warzone2100 (2.1.0~0.svn2727-0) unstable; urgency=low
+warzone2100 (2.1.0~0.svn2728-0) unstable; urgency=low
 
   * Bump upstream version number for the development branch
     - This version is _not_ an official release, just a development
       snapshot.
+  * Disable compilation of QuesoGLC while creating a Debian package
 
- -- Giel van Schijndel <muggenhor@gna.org>  Mon,  5 Nov 2007 16:53:51 +0100
+ -- Giel van Schijndel <muggenhor@gna.org>  Mon,  5 Nov 2007 18:04:07 +0100
 
 warzone2100 (2.0.8-rc1-0) unstable; urgency=low
 

debian/rules

@@ -44,7 +44,7 @@ configure:
 config.status: configure
 	dh_testdir
 
-	CFLAGS="$(CFLAGS)" ./configure $(CONFFLAGS) --prefix=/usr --bindir=\$${prefix}/games --datadir=\$${prefix}/share/games --mandir=\$${prefix}/share/man --enable-data
+	CFLAGS="$(CFLAGS)" ./configure $(CONFFLAGS) --prefix=/usr --bindir=\$${prefix}/games --datadir=\$${prefix}/share/games --mandir=\$${prefix}/share/man --enable-data --disable-quesoglc
 
 
 build: build-stamp