Changeset 18483

Show
Ignore:
Timestamp:
10.02.2009 09:53:43 (11 years ago)
Author:
davidb
Message:

Addition of Apache's httpd web server (version 2.x) into runtime-src packages; plus changes to configure and Makefile.in scripts

Location:
gsdl/trunk
Files:
2 added
3 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/configure.in

    r18214 r18483  
    1212AC_SUBST(VERSION) 
    1313 
     14 
    1415dnl 
    1516dnl Set use of fast cgi 
     
    7273AC_DEFINE(USE_SQLITE, $USE_SQLITE) 
    7374AC_SUBST(USE_SQLITE) 
     75 
     76dnl 
     77dnl Set use of Apache httpd (enabled by default) 
     78dnl 
     79AC_ARG_ENABLE(apache-httpd, [  --disable-apache-httpd  Disable Apache httpd support], USE_APACHE_HTTPD=0, USE_APACHE_HTTPD=1) 
     80AC_DEFINE(USE_APACHE_HTTPD, $USE_APACHE_HTTPD) 
     81AC_SUBST(USE_APACHE_HTTPD) 
     82 
    7483 
    7584dnl Checks for programs. 
  • gsdl/trunk/runtime-src/configure.in

    r18214 r18483  
    7474AC_DEFINE(USE_SQLITE, $USE_SQLITE) 
    7575AC_SUBST(USE_SQLITE) 
     76 
     77dnl 
     78dnl Set use of Apache httpd (enabled by default) 
     79dnl 
     80AC_ARG_ENABLE(apache-httpd, [  --disable-apache-httpd  Disable Apache httpd support], USE_APACHE_HTTPD=0, USE_APACHE_HTTPD=1) 
     81AC_DEFINE(USE_APACHE_HTTPD, $USE_APACHE_HTTPD) 
     82AC_SUBST(USE_APACHE_HTTPD) 
     83 
    7684 
    7785dnl Checks for programs. 
  • gsdl/trunk/runtime-src/packages/Makefile.in

    r16568 r18483  
    2828USE_Z3950=@USE_Z3950@ 
    2929USE_YAZ=@USE_YAZ@ 
     30USE_APACHE_HTTPD=@USE_APACHE_HTTPD@ 
    3031 
    3132ifeq ($(USE_Z3950), 1) 
     
    5758endif 
    5859 
     60 
     61ifeq ($(USE_APACHE_HTTPD), 1) 
     62HTTPD=apache-httpd/httpd-2.2.11 
     63else 
     64HTTPD= 
     65endif 
     66 
     67 
    5968# PACKAGEDIRS contains the packages that we want to make and install.  It 
    6069# is assumed that each package will have at least four rules: all, install, 
    6170# clean, and distclean. 
    62 PACKAGEDIRS =   $(YAZ) $(D2M) $(CORBA)  
     71PACKAGEDIRS =   $(YAZ) $(D2M) $(CORBA)  $(HTTPD) 
    6372 
    6473