Changeset 28316

Timestamp:

2013-09-26T16:32:41+12:00 (11 years ago)

Author:

ak19

Message:

Adding in the enable-gnome-lib-ext configure flag for GS2's configure as well: this additionally checks out the gnome-lib package from SVN before compiling it.

Location:

main/trunk/greenstone2

Files:

• configure (modified) (4 diffs)
• configure.in (modified) (1 diff)

main/trunk/greenstone2/configure

@@ -681 +681 @@
 CFLAGS
 LDFLAGS
+ENABLE_GNOMELIB_EXT
 ENABLE_LUCENE
 ENABLE_MGPP
@@ -757 +758 @@
 enable_mgpp
 enable_lucene
+enable_gnome_lib_ext
 with_dmalloc
 with_regex
@@ -1415 +1417 @@
   --disable-mgpp          Disable MGPP compilation
   --disable-lucene        Disable Lucene compilation
+  --enable-gnome-lib-ext  Enable the gnome-lib extension
 
 Optional Packages:
@@ -2201 +2204 @@
 else
   ENABLE_LUCENE=0
+fi
+
+
+
+# Check whether --enable-gnome-lib-ext was given.
+if test "${enable_gnome_lib_ext+set}" = set; then
+  enableval=$enable_gnome_lib_ext; ENABLE_GNOMELIB_EXT=1
+else
+  ENABLE_GNOMELIB_EXT=0
+fi
+
+if test -d ext/gnome-lib ; then
+   cat >>confdefs.h <<\_ACEOF
+#define ENABLE_GNOMELIB_EXT $ENABLE_GNOMELIB_EXT
+_ACEOF
+
+elif test -d ext/gnome-lib-minimal ; then
+   cat >>confdefs.h <<\_ACEOF
+#define ENABLE_GNOMELIB_EXT $ENABLE_GNOMELIB_EXT
+_ACEOF
+
+else
+   # Running `svn` returns 127 if no svn is installed. It returns 1 if svn is installed,
+   # since it suggests running svn --help. It returns 0 if running `svn --version`
+
+   if test $ENABLE_GNOMELIB_EXT = 1; then
+      echo "@@@@ TOTO"
+      svn --version
+      result=$?
+      if test $result = 0; then
+         cd ext
+     svn co http://svn.greenstone.org/gs2-extensions/gnome-lib/trunk/src gnome-lib
+     cd ..
+     cat >>confdefs.h <<\_ACEOF
+#define ENABLE_GNOMELIB_EXT 1
+_ACEOF
+
+      else
+         echo "**** WARNING: No gnome-lib or gnome-lib-minimal in gs2build/ext folder. Unable to check out gnome-lib. Disabling gnome-lib-ext."
+     cat >>confdefs.h <<\_ACEOF
+#define ENABLE_GNOMELIB_EXT 0
+_ACEOF
+
+      fi
+   fi
 fi
 

main/trunk/greenstone2/configure.in

@@ -223 +223 @@
 fi
 AC_SUBST(ENABLE_LUCENE)
+
+
+dnl
+dnl Set compilation and/or sourcing of gnome-lib extension (disabled by default)
+dnl
+AC_ARG_ENABLE(gnome-lib-ext, [  --enable-gnome-lib-ext  Enable the gnome-lib extension], ENABLE_GNOMELIB_EXT=1, ENABLE_GNOMELIB_EXT=0)
+if test -d ext/gnome-lib ; then
+   AC_DEFINE(ENABLE_GNOMELIB_EXT, $ENABLE_GNOMELIB_EXT)
+elif test -d ext/gnome-lib-minimal ; then
+   AC_DEFINE(ENABLE_GNOMELIB_EXT, $ENABLE_GNOMELIB_EXT)
+else
+   # Running `svn` returns 127 if no svn is installed. It returns 1 if svn is installed, 
+   # since it suggests running svn --help. It returns 0 if running `svn --version`
+
+   if test $ENABLE_GNOMELIB_EXT = 1; then
+      echo "@@@@ TOTO"
+      svn --version
+      result=$?
+      if test $result = 0; then
+         cd ext
+     svn co http://svn.greenstone.org/gs2-extensions/gnome-lib/trunk/src gnome-lib
+     cd ..
+     AC_DEFINE(ENABLE_GNOMELIB_EXT, 1)
+      else
+         echo "**** WARNING: No gnome-lib or gnome-lib-minimal in gs2build/ext folder. Unable to check out gnome-lib. Disabling gnome-lib-ext."
+     AC_DEFINE(ENABLE_GNOMELIB_EXT, 0)
+      fi
+   fi
+fi
+AC_SUBST(ENABLE_GNOMELIB_EXT)