Changeset 21376 for main/trunk/gs2build/configure.in

Timestamp:

2009-12-18T14:28:14+13:00 (13 years ago)

Author:

ak19

Message:

Now the configure, configure.in, Makefile.in and config.h.in of gs2build and greenstone2 are the same, so that they can just be obtained from one source in future. Need to include configtest.pl into gs2build for now to get the changes to configure.in to still work

File:

• main/trunk/gs2build/configure.in (modified) (5 diffs)

main/trunk/gs2build/configure.in

@@ -72 +72 @@
 AC_DEFINE(USE_SQLITE, $USE_SQLITE)
 AC_SUBST(USE_SQLITE)
+
+dnl
+dnl Set use of Apache httpd (disabled by default)
+dnl
+if test -d runtime-src; then
+   AC_ARG_ENABLE(apache-httpd, [  --enable-apache-httpd  Enable Apache httpd support], USE_APACHE_HTTPD=1, USE_APACHE_HTTPD=0)
+   AC_DEFINE(USE_APACHE_HTTPD, $USE_APACHE_HTTPD)
+   AC_SUBST(USE_APACHE_HTTPD)
+fi
 
 dnl
@@ -229 +238 @@
 dnl check for -lcrypt:
 AC_HAVE_LIBRARY(crypt)
-if test $ENABLE_ACCENTFOLD = 1; then
-AC_HAVE_LIBRARY(iconv)
-fi
+#if test $ENABLE_ACCENTFOLD = 1; then
+#AC_HAVE_LIBRARY(iconv)
+#fi
 
 dnl Checks for header files.
@@ -292 +301 @@
 dnl
 AC_LANG_CPLUSPLUS
+
+dnl
+dnl Now check that Perl is actually around, and can be found
+dnl
+AC_MSG_CHECKING(that Perl 5 is available)
+success="no"
+pl_path="$PATH"
+IFS="${IFS=   }"; pl_save_ifs="$IFS"; IFS=":"
+for pl_dir in $pl_path; do
+  test -z "$pl_dir" && pl_dir=.
+  if test -x $pl_dir/perl; then
+    success="yes"
+    break
+  fi
+done
+IFS="$pl_save_ifs"
+
+dnl
+dnl Perl actually can be run; now we see if it is version 5 by
+dnl running a sample script (which returns a "clean" version number
+dnl and then tests the result using expr.  If perl errors in some
+dnl way (eg. broken Perl executable, missing script), we set a failure
+dnl value ("0") and then proceed as best we can
+dnl
+if test $success = "yes"; then
+try=`perl configtest.pl` || try="0"
+try=`expr $try \> 5.000`
+if test $try = "1"; then
+AC_MSG_RESULT("yes")
+else
+success="no"
+fi
+fi
+
+if test $success = "no"; then
+AC_MSG_RESULT("no")
+AC_MSG_ERROR("Perl 5 not available - cannot install")
+fi
 
 dnl
@@ -386 +433 @@
 # indexers needs a bindir option to get the binaries into the right place
 gsdlprefix=`pwd`
-ac_configure_args="$ac_configure_args --bindir=$gsdlprefix/bin/$gsdlos "
-AC_CONFIG_SUBDIRS(common-src build-src)
+ac_configure_args="$ac_configure_args --bindir=$gsdlprefix/bin/$gsdlos --libdir=$gsdlprefix/lib/$gsdlos"
+AC_CONFIG_SUBDIRS(common-src)
+AC_CONFIG_SUBDIRS(build-src)
 
 # the list of folders in the src folder
@@ -393 +441 @@
          build-src/Makefile"
 
+if test -d runtime-src; then
+   AC_CONFIG_SUBDIRS(runtime-src)
+   srclist="$srclist \
+         runtime-src/Makefile"
+fi
+
 AC_OUTPUT(Makefile $srclist $moduleDirs)