apr-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Mo DeJong <mdej...@cygnus.com>
Subject Re: Patch to fix dirs when builddir != srcdir
Date Sat, 16 Dec 2000 23:01:01 GMT
Here is another patch that fixes the RUN_SUBDIR_CONFIG_NOW
macro when it is run from the build directory and the
macro gets included into a configure.in from another
project. The problem was the the system did not know
where the helpers dir was.

Index: aclocal.m4
===================================================================
RCS file: /home/cvspublic/apr/aclocal.m4,v
retrieving revision 1.35
diff -u -r1.35 aclocal.m4
--- aclocal.m4	2000/12/15 16:56:51	1.35
+++ aclocal.m4	2000/12/16 22:57:11
@@ -328,7 +328,7 @@
 AC_DEFUN(APR_PREPARE_MM_DIR,[
 dnl #----------------------------- Prepare mm directory for VPATH support
 if test -n "$USE_MM" && test -n "$USE_VPATH"; then
-  test -d $mm_dir || $MKDIR $mm_dir
+  test -d $mm_dir || APR_MKDIR($mm_dir)
 
   for i in shtool config.guess config.sub fbtool ltconfig \
            ltmain.sh mm_vers.c; do
Index: apr_common.m4
===================================================================
RCS file: /home/cvspublic/apr/apr_common.m4,v
retrieving revision 1.9
diff -u -r1.9 apr_common.m4
--- apr_common.m4	2000/11/29 23:11:21	1.9
+++ apr_common.m4	2000/12/16 22:57:11
@@ -1,4 +1,39 @@
 dnl
+dnl APR_MKDIR(dir)
+dnl
+dnl This macro works like `mkdir -p $dir' on systems that do not
+dnl support the -p flag to mkdir
+dnl
+dnl Based on `mkinstalldirs' from Noah Friedman <friedman@prep.ai.mit.edu>
+dnl as of 1994-03-25, which was placed in the Public Domain.
+dnl Cleaned up for Apache's Autoconf-style Interface (APACI)
+dnl by Ralf S. Engelschall <rse@apache.org>
+
+AC_DEFUN(APR_MKDIR, [
+  umask_saved=`umask`
+  umask 022
+
+  dir=$1
+  dirlist=`echo ":$dir" |\
+               sed -e 's/^:\//%/' -e 's/^://' -e 's/\// /g' -e 's/^%/\//'`
+
+  pathcomp=
+  for d in $dirlist; do
+    pathcomp="$pathcomp$d"
+    case "$pathcomp" in
+      -* ) pathcomp=./$pathcomp ;;
+    esac
+    if test ! -d "$pathcomp"; then
+      #echo "mkdir $pathcomp" 1>&2
+      mkdir "$pathcomp"
+    fi
+    pathcomp="$pathcomp/"
+  done
+  echo "mkdir -p $1"
+  umask $umask_saved > /dev/null
+])
+
+dnl
 dnl RUN_SUBDIR_CONFIG_NOW(dir [, sub-package-cmdline-args])
 dnl
 AC_DEFUN(RUN_SUBDIR_CONFIG_NOW, [
@@ -9,7 +44,7 @@
   ac_popdir=`pwd`
   ac_abs_srcdir=`(cd $srcdir/$1 && pwd)`
   apr_config_subdirs="$1"
-  test -d $1 || $srcdir/helpers/mkdir.sh $1
+  test -d $1 || APR_MKDIR($1)
   cd $1
 
 changequote(, )dnl
Index: configure.in
===================================================================
RCS file: /home/cvspublic/apr/configure.in,v
retrieving revision 1.189
diff -u -r1.189 configure.in
--- configure.in	2000/12/15 16:56:51	1.189
+++ configure.in	2000/12/16 22:57:11
@@ -26,7 +26,6 @@
 dnl XXX This assumes that APR "lives" under Apache.
 dnl XXX We'll need to fix this when we pull it out.
 abs_helpersdir=$abs_srcdir/helpers
-MKDIR=$abs_helpersdir/mkdir.sh
 
 if test "$abs_builddir" != "$abs_srcdir"; then
   USE_VPATH=1
@@ -801,7 +800,7 @@
 SUBDIRS="lib strings passwd tables "
 for dir in $MODULES
 do
-    test -d $dir || $MKDIR $dir
+    test -d $dir || APR_MKDIR($dir)
     if test -f $srcdir/$dir/$OSDIR/Makefile.in; then
         MAKEFILE2="$MAKEFILE2 $dir/$OSDIR/Makefile "
         SUBDIRS="$SUBDIRS $dir/$OSDIR "
@@ -826,7 +825,7 @@
 done
 
 dir=include/arch/unix
-test -d $dir || $MKDIR $dir
+test -d $dir || APR_MKDIR($dir)
 
 AC_OUTPUT($MAKEFILE1 $MAKEFILE2 $MAKEFILE3 include/apr.h APRVARS,[
 


Mime
View raw message