Changeset 21377 for main/trunk/greenstone2/configure

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

main/trunk/greenstone2/configure

@@ -309 +309 @@
 #endif"
 
-ac_subdirs_all="$ac_subdirs_all common-src build-src runtime-src"
+ac_subdirs_all="$ac_subdirs_all common-src"
+ac_subdirs_all="$ac_subdirs_all build-src"
+ac_subdirs_all="$ac_subdirs_all runtime-src"
 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_ACCENTFOLD USE_SQLITE USE_APACHE_HTTPD ENABLE_JNI ENABLE_MG ENABLE_MGPP ENABLE_LUCENE LDFLAGS CFLAGS CC CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX 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_files=''
@@ -1437 +1439 @@
 
 
-# Check whether --enable-apache-httpd or --disable-apache-httpd was given.
+if test -d runtime-src; then
+   # Check whether --enable-apache-httpd or --disable-apache-httpd was given.
 if test "${enable_apache_httpd+set}" = set; then
   enableval="$enable_apache_httpd"
@@ -1444 +1447 @@
   USE_APACHE_HTTPD=0
 fi;
-cat >>confdefs.h <<\_ACEOF
+   cat >>confdefs.h <<\_ACEOF
 #define USE_APACHE_HTTPD $USE_APACHE_HTTPD
 _ACEOF
 
 
+fi
 
 # Check whether --enable-jni or --disable-jni was given.
@@ -7305 +7309 @@
 
 
-subdirs="$subdirs common-src build-src runtime-src"
+subdirs="$subdirs common-src"
+
+
+
+subdirs="$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
+
+
+subdirs="$subdirs runtime-src"
+
+   srclist="$srclist \
          runtime-src/Makefile"
+fi
 
                               ac_config_files="$ac_config_files Makefile $srclist $moduleDirs"