* Aaron Bannert ([EMAIL PROTECTED]) wrote : > On Tue, Feb 26, 2002 at 03:52:32PM -0800, Justin Erenkrantz wrote: > > On Tue, Feb 26, 2002 at 11:47:42AM -0800, Aaron Bannert wrote: > > > Are we content with --enable-layout potentially overwriting all > > > --prefix -like parameters? > > > > I'm not. I think any argument specified on the command-line (such > > as --prefix) should override the specified layout. It worked like > > this in 1.3 (yes, it didn't use autoconf, but so what?). -- justin > > As I pointed out in my message *and* on irc where we were just having > this discussion, there is no way to let --prefix override the layout > with autoconf in a way that is guaranteed to work across versions > of autoconf, at least as far as I can see. If you can come up with > a way to let that happen, I'd be happy to hear it, but in the mean > time I don't think it's crutial to getting --enable-layout working*. > > * yes, we have this working now. Patch forthcoming. > As promised:
Index: acinclude.m4 =================================================================== RCS file: /home/cvspublic/httpd-2.0/acinclude.m4,v retrieving revision 1.110 diff -u -u -r1.110 acinclude.m4 --- acinclude.m4 26 Feb 2002 21:31:45 -0000 1.110 +++ acinclude.m4 27 Feb 2002 00:19:07 -0000 @@ -325,23 +325,6 @@ done changequote([,]) ])dnl -dnl -dnl APACHE_ENABLE_LAYOUT -dnl -AC_DEFUN(APACHE_ENABLE_LAYOUT,[ -AC_ARG_ENABLE(layout, -APACHE_HELP_STRING(--enable-layout=LAYOUT,Default file layout),[ - LAYOUT=$enableval -]) - -if test -z "$LAYOUT"; then - LAYOUT="Apache" -fi -APACHE_LAYOUT($srcdir/config.layout, $LAYOUT) - -AC_MSG_CHECKING(for chosen layout) -AC_MSG_RESULT($layout_name) -]) dnl dnl APACHE_ENABLE_MODULES Index: configure.in =================================================================== RCS file: /home/cvspublic/httpd-2.0/configure.in,v retrieving revision 1.200 diff -u -u -r1.200 configure.in --- configure.in 1 Feb 2002 23:22:29 -0000 1.200 +++ configure.in 27 Feb 2002 00:19:08 -0000 @@ -18,6 +18,21 @@ sinclude(srclib/apr/build/apr_threads.m4) sinclude(acinclude.m4) +dnl Get the layout here, so we can pass the required variables to apr +dnl APACHE_ENABLE_LAYOUT +AC_ARG_ENABLE(layout, +APACHE_HELP_STRING(--enable-layout=LAYOUT,Default file layout),[ + LAYOUT=$enableval + APACHE_LAYOUT($srcdir/config.layout, $LAYOUT) +]) + +AC_MSG_CHECKING(for chosen layout) +if test -z "$LAYOUT"; then + AC_MSG_RESULT([Autoconf Defaults]) +else + AC_MSG_RESULT($layout_name) +fi + dnl Save user-defined environment settings for later restoration dnl APR_SAVE_THE_ENVIRONMENT(CPPFLAGS)
