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

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 (modified) (5 diffs)

main/trunk/greenstone2/common-src/configure

@@ -312 +312 @@
 ac_subdirs_all="$ac_subdirs_all packages"
 ac_subdirs_all="$ac_subdirs_all indexers"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PACKAGE VERSION USE_FASTCGI USE_LANGACTION USE_CORBA MICO_DIR USE_Z3950 USE_YAZ ENABLE_JAVA USE_JDBM USE_GDBM ENABLE_ACCENTFOLD USE_SQLITE ENABLE_JNI ENABLE_MG ENABLE_MGPP ENABLE_LUCENE LDFLAGS CFLAGS CC CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX JAVA uudecode JAVAC JAVACFLAGS AWK YACC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB COMPAT32BITFLAGS MICO_VER CPP EGREP U ANSI2KNR ALLOCA LIBOBJS STATIC gsdlos MODULEDIRS subdirs LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PACKAGE VERSION USE_FASTCGI USE_LANGACTION USE_CORBA MICO_DIR USE_Z3950 USE_YAZ ENABLE_JAVA USE_JDBM USE_GDBM ENABLE_ACCENTFOLD USE_SQLITE ENABLE_JNI ENABLE_MG ENABLE_MGPP ENABLE_LUCENE LDFLAGS CFLAGS CC CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX JAVA uudecode JAVAC JAVACFLAGS AWK YACC build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S SET_MAKE RANLIB ac_ct_RANLIB COMPAT32BITFLAGS MICO_VER CPP EGREP U ANSI2KNR ALLOCA LIBOBJS STATIC gsdlos gsdlarch MODULEDIRS subdirs LTLIBOBJS'
 ac_subst_files=''
 
@@ -3780 +3780 @@
   if test -z "$COMPAT32BITFLAGS" ; then
     COMPAT32BITFLAGS="-m32"
+    gsdlarch='64'
   fi
 else
@@ -3786 +3787 @@
   if test -z "$COMPAT32BITFLAGS" ; then
     COMPAT32BITFLAGS=
+    gsdlarch='32'
   fi
 fi
@@ -7566 +7568 @@
   gsdlos=windows
  fi
+
+
+# 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
 
 
@@ -8542 +8552 @@
 s,@STATIC@,$STATIC,;t t
 s,@gsdlos@,$gsdlos,;t t
+s,@gsdlarch@,$gsdlarch,;t t
 s,@MODULEDIRS@,$MODULEDIRS,;t t
 s,@subdirs@,$subdirs,;t t