Changeset 30866 for main/trunk/greenstone2

Timestamp:

2016-10-14T20:41:32+13:00 (8 years ago)

Author:

ak19

Message:

GSDLOS variable wasn't being set in configure.in and hence wasn't propagating into mgpp/jni and mgpp/text, and the jni/Makefile.in wasn;t making reference to it either.

Location:

main/trunk/greenstone2/common-src/indexers/mgpp

Files:

• configure.in (modified) (1 diff)
• jni/Makefile.in (modified) (1 diff)

main/trunk/greenstone2/common-src/indexers/mgpp/configure.in

@@ -16 +16 @@
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
+
+gsdlos=`uname | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
+# check for running bash under cygwin
+ if test "`echo $gsdlos | sed 's/cygwin//'`" != "$gsdlos" ;
+ then
+  gsdlos=windows
+ fi
+if test "x$crossOS" != "x" ; then
+  gsdlos=$crossOS
+  gsdlarch=""
+fi
+AC_SUBST(gsdlos)
 
 dnl

main/trunk/greenstone2/common-src/indexers/mgpp/jni/Makefile.in

@@ -34 +34 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 LDFLAGS = @LDFLAGS@ @ARCH_DEP_FLAGS@
+GSDLOS = @gsdlos@
 #NOTE: libmgpptext.a needs to come before libmgpplib.a !!!