Show
Ignore:
Timestamp:
18.12.2009 14:33:47 (10 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.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • 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)