Changeset 36428 for main

Timestamp:

2022-08-22T14:37:28+12:00 (21 months ago)

Author:

davidb

Message:

gnomelib opt needs to be in else clause (historic oversight, given our default params); additional changes to testing for 'true' rather than 'isset' for with.jni

File:

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

main/trunk/greenstone3/build.xml

@@ -763 +763 @@
    </condition>
 
-  <condition property="gs2.opt.args" value="${opt.gnomelibext.arg} ${opt.wvware.arg}" else="${opt.wvware.arg} --disable-mg --disable-mgpp --disable-accentfold --disable-gdbm --disable-sqlite">
+  <condition property="gs2.opt.args" value="${opt.gnomelibext.arg} ${opt.wvware.arg}" else="${opt.gnomelibext.arg} ${opt.wvware.arg} --disable-mg --disable-mgpp --disable-accentfold --disable-gdbm --disable-sqlite">
     <istrue value="${with.jni}"/>
   </condition>
@@ -3307 +3307 @@
     <mkdir dir="${build.home}"/>
     
-    <if><bool><isset property="with.jni"/></bool>
+    <if><bool><istrue value="${with.jni}"/></bool>
     <javac srcdir="${src.home}"
            destdir="${build.home}"