Changeset 24901 for main/trunk/greenstone2/common-src/configure.in

Timestamp:

2011-12-14T19:20:29+13:00 (12 years ago)

Author:

ak19

Message:

GSDLARCH used in Linux makefiles when working out the cgi-bin path (now cgi-bin\GSDL_OS_ARCH) to install the binaries into.

File:

• main/trunk/greenstone2/common-src/configure.in (modified) (3 diffs)

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

@@ -226 +226 @@
   if test -z "$COMPAT32BITFLAGS" ; then
     COMPAT32BITFLAGS="-m32"
+    gsdlarch='64'
   fi
 else
@@ -231 +232 @@
   if test -z "$COMPAT32BITFLAGS" ; then
     COMPAT32BITFLAGS=
+    gsdlarch='32'
   fi
 fi
@@ -426 +428 @@
  fi
 AC_SUBST(gsdlos)
+
+# Make gsdlarch empty if the OS bit value (32 or 64) is not used in naming 
+# directories already or if common-src is compiled up on its own.
+# E.g. 32/64 bit won't be used in the SVN version if only bin/linux exists.
+if test -d "../bin/$gsdlos" -o ! -f "../setup.bash" ; then
+   gsdlarch=""
+fi
+AC_SUBST(gsdlarch)
 
 # check for endianness