Changeset 26156 for main/trunk

Timestamp:

2012-09-06T14:56:09+12:00 (12 years ago)

Author:

kjdon

Message:

had to add AC_SUBST for ARCH_DEP_FLAGS otherwise its not passed in to unac which needs it

Location:

main/trunk/greenstone2/common-src/indexers

Files:

• configure (modified) (6 diffs)
• configure.ac (modified) (1 diff)

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

@@ -612 +612 @@
 ENABLE_JNI
 ENABLE_ACCENTFOLD
+ARCH_DEP_FLAGS
 ENABLE_JAVA
 target_alias
@@ -1756 +1757 @@
 
 
+if test -z "$ARCH_DEP_FLAGS" ; then
+    ARCH_DEP_FLAGS=
+fi
+
+
 # Check whether --enable-accentfold was given.
 if test "${enable_accentfold+set}" = set; then
@@ -1958 +1964 @@
 CLASS_TEST=Test.class
 cat << \EOF > $JAVA_TEST
-/* #line 1960 "configure" */
+/* #line 1966 "configure" */
 public class Test {
 }
@@ -2141 +2147 @@
         ac_cv_prog_uudecode_base64=yes
 else
-        echo "configure: 2143: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
+        echo "configure: 2149: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
         echo "configure: failed file was:" >&5
         cat Test.uue >&5
@@ -2268 +2274 @@
 CLASS_TEST=Test.class
 cat << \EOF > $JAVA_TEST
-/* #line 2270 "configure" */
+/* #line 2276 "configure" */
 public class Test {
 }
@@ -2309 +2315 @@
 TEST=Test
 cat << \EOF > $JAVA_TEST
-/* [#]line 2311 "configure" */
+/* [#]line 2317 "configure" */
 public class Test {
 public static void main (String args[]) {

main/trunk/greenstone2/common-src/indexers/configure.ac

@@ -20 +20 @@
 fi
 AC_SUBST(ENABLE_JAVA)
+
+dnl AC_MSG_CHECKING(to see if architecture is 64-bit)
+dnl arch_64bit=no
+dnl case "$host_cpu" in
+dnl x86_64) arch_64bit=yes ;;
+dnl esac
+if test -z "$ARCH_DEP_FLAGS" ; then
+    ARCH_DEP_FLAGS=
+fi
+AC_SUBST(ARCH_DEP_FLAGS)
 
 dnl