When I run "./configure" I always have to specify both "--libdir" and "--includedir" on command line if I want to get things right...
--libdir needs to be specified because in "config.layout" this is never
specified (so it defaults to autoconf's default "${exec_prefix}/lib")
--includedir is not passed on the command line of sub-configure in
configure.in as "--libdir" is, thus preventing sub-configure scripts to
correctly intercept that value...
This patch fixes this behavior: in "configure.in", when calling
sub-configure scripts, --includedir is always specified as --libdir is, and
in "config.layout" the libdir value has been added for each layout (either
following the default in autoconf, or coherently specifying the value).
In "config.layout" there's also a new layout called "DarwinBundle", which
creates an installation of Apache 2 similar to an application bundle
(everything is self contained)... I still have to work on versioning like
Darwin does, but it's a very-early first-step layout)... Nothing is
standard, so it can also be used to see if "make ; make install" does
everything right...
Have fun! :)
Pier (more boredom)
layout.patch.txt
Description: application/applefile
Index: configure.in
===================================================================
RCS file: /home/cvspublic/httpd-2.0/configure.in,v
retrieving revision 1.211
diff -U3 -r1.211 configure.in
--- configure.in 21 Mar 2002 19:40:06 -0000 1.211
+++ configure.in 3 Apr 2002 19:18:58 -0000
@@ -59,15 +59,15 @@
echo $ac_n "${nl}Configuring Apache Portable Runtime library ...${nl}"
-APR_SUBDIR_CONFIG(srclib/apr, "$apache_apr_flags --prefix=$prefix
--exec-prefix=$exec_prefix --libdir=$libdir --bindir=$bindir --datadir=$datadir
--with-installbuilddir=$installbuilddir")
+APR_SUBDIR_CONFIG(srclib/apr, "$apache_apr_flags --prefix=$prefix
+--exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir
+--datadir=$datadir --with-installbuilddir=$installbuilddir")
echo $ac_n "${nl}Configuring Apache Portable Runtime Utility library...${nl}"
-APR_SUBDIR_CONFIG(srclib/apr-util, "--with-apr=../apr --prefix=$prefix
--exec-prefix=$exec_prefix --libdir=$libdir --bindir=$bindir")
+APR_SUBDIR_CONFIG(srclib/apr-util, "--with-apr=../apr --prefix=$prefix
+--exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir
+--bindir=$bindir")
echo $ac_n "${nl}Configuring PCRE regular expression library ...${nl}"
-APR_SUBDIR_CONFIG(srclib/pcre, "--prefix=$prefix --exec-prefix=$exec_prefix
--libdir=$libdir --bindir=$bindir")
+APR_SUBDIR_CONFIG(srclib/pcre, "--prefix=$prefix --exec-prefix=$exec_prefix
+--libdir=$libdir --includedir=$includedir --bindir=$bindir")
echo $ac_n "${nl}Configuring Apache httpd ...${nl}"
Index: config.layout
===================================================================
RCS file: /home/cvspublic/httpd-2.0/config.layout,v
retrieving revision 1.14
diff -U3 -r1.14 config.layout
--- config.layout 28 Mar 2002 19:04:47 -0000 1.14
+++ config.layout 3 Apr 2002 19:20:46 -0000
@@ -15,6 +15,7 @@
exec_prefix: ${prefix}
bindir: ${exec_prefix}/bin
sbindir: ${exec_prefix}/bin
+ libdir: ${exec_prefix}/lib
libexecdir: ${exec_prefix}/modules
mandir: ${prefix}/man
sysconfdir: ${prefix}/conf
@@ -39,6 +40,7 @@
exec_prefix: ${prefix}
bindir: ${exec_prefix}/bin
sbindir: ${exec_prefix}/sbin
+ libdir: ${exec_prefix}/lib
libexecdir: ${exec_prefix}/libexec
mandir: ${prefix}/man
sysconfdir: ${prefix}/etc+
@@ -62,6 +64,7 @@
exec_prefix:
bindir: bin
sbindir: bin
+ libdir: lib
libexecdir: libexec
mandir: man
sysconfdir: conf
@@ -85,6 +88,7 @@
exec_prefix: /usr
bindir: ${exec_prefix}/bin
sbindir: ${exec_prefix}/sbin
+ libdir: ${exec_prefix}/lib
libexecdir: /System/Library/Apache/Modules
mandir: ${exec_prefix}/share/man
sysconfdir: ${prefix}/Configuration
@@ -108,6 +112,7 @@
exec_prefix: ${prefix}
bindir: ${exec_prefix}/bin
sbindir: ${exec_prefix}/sbin
+ libdir: ${exec_prefix}/lib
libexecdir: ${exec_prefix}/libexec+
mandir: ${prefix}/share/man
datadir: /Library/WebServer
@@ -125,12 +130,37 @@
proxycachedir: ${runtimedir}/proxy
</Layout>
+# Darwin/Mac OS X Bundle Layout
+<Layout DarwinBundle>
+ prefix: /Library/Services/Apache2
+ exec_prefix: ${prefix}
+ bindir: ${exec_prefix}/Binaries
+ sbindir: ${exec_prefix}/Binaries
+ libdir: ${exec_prefix}/Libraries
+ libexecdir: ${exec_prefix}/Modules
+ mandir: ${prefix}/ManPages
+ sysconfdir: ${prefix}/Configurations
+ datadir: ${prefix}/Data
+ installbuilddir: ${prefix}/Libraries
+ errordir: ${datadir}/ErrorPages
+ iconsdir: ${datadir}/Icons
+ htdocsdir: ${prefix}/Sites/Default
+ manualdir: ${datadir}/Manual
+ cgidir: ${datadir}/CgiScripts
+ includedir: ${prefix}/Include
+ localstatedir: ${prefix}
+ runtimedir: ${localstatedir}/Logs
+ logfiledir: ${localstatedir}/Logs
+ proxycachedir: ${datadir}/Proxy
+</Layout>
+
# RedHat 7.x layout
<Layout RedHat>
prefix: /usr
exec_prefix: ${prefix}
bindir: ${prefix}/bin
sbindir: ${prefix}/sbin
+ libdir: ${prefix}/lib
libexecdir: ${prefix}/lib/apache
mandir: ${prefix}/man
sysconfdir: /etc/httpd/conf
@@ -154,6 +184,7 @@
exec_prefix: ${prefix}
bindir: ${exec_prefix}/bin
sbindir: ${exec_prefix}/sbin
+ libdir: ${exec_prefix}/lib
libexecdir: ${exec_prefix}/libexec
mandir: ${prefix}/man
sysconfdir: /etc${prefix}
@@ -177,6 +208,7 @@
exec_prefix: ${prefix}
bindir: ${exec_prefix}/bin
sbindir: ${exec_prefix}/bin
+ libdir: ${exec_prefix}/lib
libexecdir: ${exec_prefix}/libexec
mandir: ${prefix}/man
sysconfdir: ${prefix}/conf
@@ -200,6 +232,7 @@
exec_prefix: ${prefix}
bindir: ${prefix}/bin
sbindir: ${prefix}/sbin
+ libdir: ${prefix}/lib
libexecdir: ${prefix}/lib/apache
mandir: ${prefix}/man
sysconfdir: /etc/httpd
@@ -223,6 +256,7 @@
exec_prefix: /usr/contrib
bindir: ${exec_prefix}/bin
sbindir: ${exec_prefix}/bin
+ libdir: ${exec_prefix}/lib
libexecdir: ${exec_prefix}/libexec/apache
mandir: ${exec_prefix}/man
sysconfdir: ${prefix}/conf
@@ -246,6 +280,7 @@
exec_prefix: ${prefix}
bindir: ${exec_prefix}/bin
sbindir: ${exec_prefix}/bin
+ libdir: ${exec_prefix}/lib
libexecdir: ${exec_prefix}/libexec
mandir: ${exec_prefix}/man
sysconfdir: /etc/apache
@@ -269,6 +304,7 @@
exec_prefix: /usr
bindir: ${exec_prefix}/bin
sbindir: ${exec_prefix}/sbin
+ libdir: ${exec_prefix}/lib
libexecdir: ${exec_prefix}/lib/apache/modules
mandir: ${exec_prefix}/share/man
sysconfdir: ${prefix}/conf
@@ -292,6 +328,7 @@
exec_prefix: ${prefix}/usr
bindir: ${exec_prefix}/bin
sbindir: ${exec_prefix}/sbin
+ libdir: ${exec_prefix}/lib
libexecdir: ${exec_prefix}/lib/apache2/modules
mandir: ${exec_prefix}/share/man
sysconfdir: ${prefix}/etc/apache2
@@ -309,3 +346,4 @@
installbuilddir: ${prefix}/etc/apache2/build
errordir: ${datadir}/error
</Layout>
+
