Changeset 18483 for gsdl

Timestamp:

2009-02-10T09:53:43+13:00 (15 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:

• configure.in (modified) (2 diffs)
• runtime-src/configure.in (modified) (1 diff)
• runtime-src/packages/Makefile.in (modified) (2 diffs)
• runtime-src/packages/apache-httpd (added)
• runtime-src/packages/apache-httpd/httpd-2.2.11.tar.gz (added)

gsdl/trunk/configure.in

@@ -12 +12 @@
 AC_SUBST(VERSION)
 
+
 dnl
 dnl Set use of fast cgi
@@ -72 +73 @@
 AC_DEFINE(USE_SQLITE, $USE_SQLITE)
 AC_SUBST(USE_SQLITE)
+
+dnl
+dnl Set use of Apache httpd (enabled by default)
+dnl
+AC_ARG_ENABLE(apache-httpd, [  --disable-apache-httpd  Disable Apache httpd support], USE_APACHE_HTTPD=0, USE_APACHE_HTTPD=1)
+AC_DEFINE(USE_APACHE_HTTPD, $USE_APACHE_HTTPD)
+AC_SUBST(USE_APACHE_HTTPD)
+
 
 dnl Checks for programs.

gsdl/trunk/runtime-src/configure.in

@@ -74 +74 @@
 AC_DEFINE(USE_SQLITE, $USE_SQLITE)
 AC_SUBST(USE_SQLITE)
+
+dnl
+dnl Set use of Apache httpd (enabled by default)
+dnl
+AC_ARG_ENABLE(apache-httpd, [  --disable-apache-httpd  Disable Apache httpd support], USE_APACHE_HTTPD=0, USE_APACHE_HTTPD=1)
+AC_DEFINE(USE_APACHE_HTTPD, $USE_APACHE_HTTPD)
+AC_SUBST(USE_APACHE_HTTPD)
+
 
 dnl Checks for programs.

gsdl/trunk/runtime-src/packages/Makefile.in

@@ -28 +28 @@
 USE_Z3950=@USE_Z3950@
 USE_YAZ=@USE_YAZ@
+USE_APACHE_HTTPD=@USE_APACHE_HTTPD@
 
 ifeq ($(USE_Z3950), 1)
@@ -57 +58 @@
 endif
 
+
+ifeq ($(USE_APACHE_HTTPD), 1)
+HTTPD=apache-httpd/httpd-2.2.11
+else
+HTTPD=
+endif
+
+
 # PACKAGEDIRS contains the packages that we want to make and install.  It
 # is assumed that each package will have at least four rules: all, install,
 # clean, and distclean.
-PACKAGEDIRS =   $(YAZ) $(D2M) $(CORBA) 
+PACKAGEDIRS =   $(YAZ) $(D2M) $(CORBA)  $(HTTPD)