Changeset 21377


Ignore:
Timestamp:
12/18/09 14:33:47 (11 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:
5 edited

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/Makefile.in

    r21366 r21377  
    105105    fi
    106106
    107 # For GS2: include the Greenstone Server Interface Makefile here
    108 # http://www.makelinux.net/make3/make3-CHP-3-SECT-7.html
    109 sinclude GSI-Makefile
    110 
    111107distclean: clean
    112108    rm -f Makefile config.cache config.h config.log stamp-h config.status
  • main/trunk/greenstone2/common-src/config.h.in

    r21327 r21377  
    115115#undef ENABLE_LUCENE
    116116
     117/* Define ENABLE_JNI */
     118#undef ENABLE_JNI
     119
    117120/* Define MICO_DIR if needsbe */
    118121#undef MICO_DIR
  • main/trunk/greenstone2/config.h.in

    r21330 r21377  
    115115#undef ENABLE_LUCENE
    116116
     117/* Define ENABLE_JNI */
     118#undef ENABLE_JNI
     119
    117120/* Define MICO_DIR if needsbe */
    118121#undef MICO_DIR
  • main/trunk/greenstone2/configure

    r21366 r21377  
    309309#endif"
    310310
    311 ac_subdirs_all="$ac_subdirs_all common-src build-src runtime-src"
     311ac_subdirs_all="$ac_subdirs_all common-src"
     312ac_subdirs_all="$ac_subdirs_all build-src"
     313ac_subdirs_all="$ac_subdirs_all runtime-src"
    312314ac_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'
    313315ac_subst_files=''
     
    14371439
    14381440
    1439 # Check whether --enable-apache-httpd or --disable-apache-httpd was given.
     1441if test -d runtime-src; then
     1442   # Check whether --enable-apache-httpd or --disable-apache-httpd was given.
    14401443if test "${enable_apache_httpd+set}" = set; then
    14411444  enableval="$enable_apache_httpd"
     
    14441447  USE_APACHE_HTTPD=0
    14451448fi;
    1446 cat >>confdefs.h <<\_ACEOF
     1449   cat >>confdefs.h <<\_ACEOF
    14471450#define USE_APACHE_HTTPD $USE_APACHE_HTTPD
    14481451_ACEOF
    14491452
    14501453
     1454fi
    14511455
    14521456# Check whether --enable-jni or --disable-jni was given.
     
    73057309
    73067310
    7307 subdirs="$subdirs common-src build-src runtime-src"
     7311subdirs="$subdirs common-src"
     7312
     7313
     7314
     7315subdirs="$subdirs build-src"
    73087316
    73097317
    73107318# the list of folders in the src folder
    73117319srclist="common-src/Makefile \
    7312          build-src/Makefile \
     7320         build-src/Makefile"
     7321
     7322if test -d runtime-src; then
     7323
     7324
     7325subdirs="$subdirs runtime-src"
     7326
     7327   srclist="$srclist \
    73137328         runtime-src/Makefile"
     7329fi
    73147330
    73157331                              ac_config_files="$ac_config_files Makefile $srclist $moduleDirs"
  • main/trunk/greenstone2/configure.in

    r21366 r21377  
    7777dnl Set use of Apache httpd (disabled by default)
    7878dnl
    79 AC_ARG_ENABLE(apache-httpd, [  --enable-apache-httpd  Enable Apache httpd support], USE_APACHE_HTTPD=1, USE_APACHE_HTTPD=0)
    80 AC_DEFINE(USE_APACHE_HTTPD, $USE_APACHE_HTTPD)
    81 AC_SUBST(USE_APACHE_HTTPD)
     79if test -d runtime-src; then
     80   AC_ARG_ENABLE(apache-httpd, [  --enable-apache-httpd  Enable Apache httpd support], USE_APACHE_HTTPD=1, USE_APACHE_HTTPD=0)
     81   AC_DEFINE(USE_APACHE_HTTPD, $USE_APACHE_HTTPD)
     82   AC_SUBST(USE_APACHE_HTTPD)
     83fi
    8284
    8385dnl
     
    434436gsdlprefix=`pwd`
    435437ac_configure_args="$ac_configure_args --bindir=$gsdlprefix/bin/$gsdlos --libdir=$gsdlprefix/lib/$gsdlos"
    436 AC_CONFIG_SUBDIRS(common-src build-src runtime-src)
     438AC_CONFIG_SUBDIRS(common-src)
     439AC_CONFIG_SUBDIRS(build-src)
    437440
    438441# the list of folders in the src folder
    439442srclist="common-src/Makefile \
    440          build-src/Makefile \
     443         build-src/Makefile"
     444
     445if test -d runtime-src; then
     446   AC_CONFIG_SUBDIRS(runtime-src)
     447   srclist="$srclist \
    441448         runtime-src/Makefile"
     449fi
    442450
    443451AC_OUTPUT(Makefile $srclist $moduleDirs)
Note: See TracChangeset for help on using the changeset viewer.