Changeset 21377

Timestamp:

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

Location:

main/trunk/greenstone2

Files:

• Makefile.in (modified) (1 diff)
• common-src/config.h.in (modified) (1 diff)
• config.h.in (modified) (1 diff)
• configure (modified) (4 diffs)
• configure.in (modified) (2 diffs)

main/trunk/greenstone2/Makefile.in

@@ -105 +105 @@
     fi
 
-# For GS2: include the Greenstone Server Interface Makefile here
-# http://www.makelinux.net/make3/make3-CHP-3-SECT-7.html
-sinclude GSI-Makefile
-
 distclean: clean
     rm -f Makefile config.cache config.h config.log stamp-h config.status

main/trunk/greenstone2/common-src/config.h.in

@@ -115 +115 @@
 #undef ENABLE_LUCENE
 
+/* Define ENABLE_JNI */
+#undef ENABLE_JNI
+
 /* Define MICO_DIR if needsbe */
 #undef MICO_DIR

main/trunk/greenstone2/config.h.in

@@ -115 +115 @@
 #undef ENABLE_LUCENE
 
+/* Define ENABLE_JNI */
+#undef ENABLE_JNI
+
 /* Define MICO_DIR if needsbe */
 #undef MICO_DIR

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"

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)