Changeset 21370

Timestamp:

2009-12-16T18:38:50+13:00 (14 years ago)

Author:

ak19

Message:

With the changes to the configure and makefiles for the new ENABLE_JNI flag, build.xml now needs to explicity ENABLE_JNI.

File:

• main/trunk/greenstone3/build.xml (modified) (5 diffs)

main/trunk/greenstone3/build.xml

@@ -1344 +1344 @@
       <arg value="--prefix=${gs2build.home}"/> <!-- what value to use?? -->
       <arg value="--bindir=${gs2build.home}/bin/${os.bin.dir}"/> <!-- what value to use?? -->
+      <arg value="--enable-jni"/>
       <arg line="${static.arg}"/>
     </exec>
@@ -1377 +1378 @@
     <!-- unix: -->
     <exec executable="make" os="${os.unix}" dir="${common.src.home}" failonerror="true">
+      <arg value="with-jni"/>
     </exec>
     <!-- windows: -->
@@ -1383 +1385 @@
       <arg value="win32.mak"/>
       <arg value="GSDLHOME=${gs2build.home}"/>
+      <arg value="ENABLE_JNI=1"/>
     </exec>
   </target>
@@ -1416 +1419 @@
     <!-- unix: -->
     <exec executable="make" os="${os.unix}" dir="${common.src.home}" failonerror="true">
-      <arg value="install"/>
+      <arg value="install-with-jni"/>
     </exec>
       
@@ -1423 +1426 @@
       <arg value="/f"/>
       <arg value="win32.mak"/>
-      <arg value="install"/>    
+      <arg value="install"/>
+      <arg value="ENABLE_JNI=1"/>
     </exec>