Fix VPATH builds

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85871 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/configure.in b/configure.in
index 4269ce09a20fc87d397d2a31fbd287e6d54af30c..283058df9051ab467b0b6d51e6a9028ebc7c3e6e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -40,6 +40,7 @@ AC_PROG_AWK
 AC_PROG_CC
 AC_PROG_CPP
 AC_PROG_INSTALL
+AC_PROG_LN_S
 dnl AC_PROG_RANLIB
 dnl AC_PATH_PROG(PERL_PATH, perl)
 

diff --git a/server/mpm/config.m4 b/server/mpm/config.m4
index 2b30ff646e384bb329d9dd3288c591cb53c565d6..15669f4cdfbddd3376238b35b2caf2344499a78a 100644 (file)
--- a/server/mpm/config.m4
+++ b/server/mpm/config.m4
@@ -60,14 +60,15 @@ dnl
 dnl This fixes that by creating a soft link that has the name of the
 dnl desired MPM to mpmt.c.  Now, Apache can search for the specified MPM
 dnl and actually find it.
+  test -d modules/mpm/mpmt || $srcdir/helpers/mkdir.sh modules/mpm/mpmt
   if test "$MPM_NAME" = "mpmt_pthread" ; then
     EXTRA_CFLAGS="$EXTRA_CFLAGS -DMPMT_PTHREAD"
     MPM_FAKE_NAME=mpmt_pthread.c
-    ln -s mpmt.c modules/mpm/mpmt/mpmt_pthread.c
+    $LN_S $abs_srcdir/modules/mpm/mpmt/mpmt.c modules/mpm/mpmt/mpmt_pthread.c
   elif test "$MPM_NAME" = "dexter" ; then
     EXTRA_CFLAGS="$EXTRA_CFLAGS -DDEXTER"
     MPM_FAKE_NAME=dexter.c
-    ln -s mpmt.c modules/mpm/mpmt/dexter.c
+    $LN_S $abs_srcdir/modules/mpm/mpmt/mpmt.c modules/mpm/mpmt/dexter.c
   fi
 
   if test "$MPM_NAME" = "dexter" -o "$MPM_NAME" = "mpmt_pthread" -o "$MPM_NAME" = "prefork"; then