Changeset 21377 for main/trunk/greenstone2/configure.in

Timestamp:

2009-12-18T14:33:47+13:00 (14 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.

File:

• main/trunk/greenstone2/configure.in (modified) (2 diffs)

main/trunk/greenstone2/configure.in

@@ -77 +77 @@
 dnl Set use of Apache httpd (disabled by default)
 dnl
-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)
+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
@@ -434 +436 @@
 gsdlprefix=`pwd`
 ac_configure_args="$ac_configure_args --bindir=$gsdlprefix/bin/$gsdlos --libdir=$gsdlprefix/lib/$gsdlos"
-AC_CONFIG_SUBDIRS(common-src build-src runtime-src)
+AC_CONFIG_SUBDIRS(common-src)
+AC_CONFIG_SUBDIRS(build-src)
 
 # the list of folders in the src folder
 srclist="common-src/Makefile \
-         build-src/Makefile \
+         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)