From a2f126c35122b4505746482492f29957325a7e18 Mon Sep 17 00:00:00 2001 From: Sascha Schumann Date: Tue, 26 Sep 2000 11:19:38 +0000 Subject: [PATCH] Build compat bridge for makes which support only the BSD .include command. This is only required for BSD/OS, because BSDI did not merge in changes from 4.4BSD Lite 1. --- acinclude.m4 | 2 +- build/bsd_makefile | 34 ++++++++++++++++++++++++++++++++++ build/fastgen.sh | 41 +++++++++++++++++++++++++++++++++-------- build/sysv_makefile | 34 ++++++++++++++++++++++++++++++++++ buildconf | 5 +++++ configure.in | 5 ++++- 6 files changed, 111 insertions(+), 10 deletions(-) create mode 100755 build/bsd_makefile create mode 100755 build/sysv_makefile diff --git a/acinclude.m4 b/acinclude.m4 index fa2ac8f260..3787964965 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -310,7 +310,7 @@ AC_DEFUN(PHP_GEN_CONFIG_VARS,[ ]) AC_DEFUN(PHP_GEN_MAKEFILES,[ - $SHELL $srcdir/build/fastgen.sh $srcdir $ac_cv_mkdir_p $1 + $SHELL $srcdir/build/fastgen.sh $srcdir $ac_cv_mkdir_p $BSD_MAKEFILE $1 ]) AC_DEFUN(PHP_TM_GMTOFF,[ diff --git a/build/bsd_makefile b/build/bsd_makefile new file mode 100755 index 0000000000..472b561822 --- /dev/null +++ b/build/bsd_makefile @@ -0,0 +1,34 @@ +#! /bin/sh +# +----------------------------------------------------------------------+ +# | PHP version 4.0 | +# +----------------------------------------------------------------------+ +# | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group | +# +----------------------------------------------------------------------+ +# | This source file is subject to version 2.02 of the PHP license, | +# | that is bundled with this package in the file LICENSE, and is | +# | available at through the world-wide-web at | +# | http://www.php.net/license/2_02.txt. | +# | If you did not receive a copy of the PHP license and are unable to | +# | obtain it through the world-wide-web, please send a note to | +# | license@php.net so we can mail you a copy immediately. | +# +----------------------------------------------------------------------+ +# | Authors: Sascha Schumann | +# +----------------------------------------------------------------------+ +# +# $Id$ +# + +# cwd must be top_srcdir +test -f build/bsd_makefile || exit 2 + +test -f bsd_converted && exit 0 + +tmpfile=`mktemp /tmp/bsd_makefile.XXXXXX 2>/dev/null` || tmpfile="tmp.$$" +for i in build/*.mk; do + sed 's/^include \(.*\)/.include "\1"/' $i >$tmpfile \ + && cp $tmpfile $i +done +rm -f $tmpfile + +touch bsd_converted +exit 0 diff --git a/build/fastgen.sh b/build/fastgen.sh index 54fe72392a..6da026994b 100755 --- a/build/fastgen.sh +++ b/build/fastgen.sh @@ -16,7 +16,7 @@ # | Authors: Sascha Schumann | # +----------------------------------------------------------------------+ # -# $Id: fastgen.sh,v 1.8 2000-08-20 05:39:37 sas Exp $ +# $Id: fastgen.sh,v 1.9 2000-09-26 11:19:38 sas Exp $ # srcdir=$1 @@ -25,6 +25,9 @@ shift mkdir_p=$1 shift +bsd_makefile=$1 +shift + top_srcdir=`(cd $srcdir; pwd)` top_builddir=`pwd` @@ -34,12 +37,32 @@ else mkdir_p="$top_srcdir/helpers/mkdir.sh" fi -for makefile in $@; do - echo "creating $makefile" - dir=`echo $makefile|sed 's%/*[^/][^/]*$%%'` - $mkdir_p "$dir/" +if test "$bsd_makefile" = "yes"; then + (cd $top_srcdir; ./build/bsd_makefile) + + for makefile in $@; do + echo "creating $makefile" + dir=`echo $makefile|sed 's%/*[^/][^/]*$%%'` + $mkdir_p "$dir/" + + cat - $top_srcdir/$makefile.in <$makefile +top_srcdir = $top_srcdir +top_builddir = $top_builddir +srcdir = $top_srcdir/$dir +builddir = $top_builddir/$dir +VPATH = $top_srcdir/$dir +EOF + + test -z "$dir" && dir=. + touch $dir/.deps + done +else + for makefile in $@; do + echo "creating $makefile" + dir=`echo $makefile|sed 's%/*[^/][^/]*$%%'` + $mkdir_p "$dir/" - cat - $top_srcdir/$makefile.in <$makefile + cat - $top_srcdir/$makefile.in <$makefile top_srcdir = $top_srcdir top_builddir = $top_builddir srcdir = $top_srcdir/$dir @@ -47,5 +70,7 @@ builddir = $top_builddir/$dir VPATH = $top_srcdir/$dir EOF - test -z "$dir" || touch $dir/.deps -done + test -z "$dir" && dir=. + touch $dir/.deps + done +fi diff --git a/build/sysv_makefile b/build/sysv_makefile new file mode 100755 index 0000000000..fedacb10ef --- /dev/null +++ b/build/sysv_makefile @@ -0,0 +1,34 @@ +#! /bin/sh +# +----------------------------------------------------------------------+ +# | PHP version 4.0 | +# +----------------------------------------------------------------------+ +# | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group | +# +----------------------------------------------------------------------+ +# | This source file is subject to version 2.02 of the PHP license, | +# | that is bundled with this package in the file LICENSE, and is | +# | available at through the world-wide-web at | +# | http://www.php.net/license/2_02.txt. | +# | If you did not receive a copy of the PHP license and are unable to | +# | obtain it through the world-wide-web, please send a note to | +# | license@php.net so we can mail you a copy immediately. | +# +----------------------------------------------------------------------+ +# | Authors: Sascha Schumann | +# +----------------------------------------------------------------------+ +# +# $Id$ +# + +# cwd must be top_srcdir +test -f build/sysv_makefile || exit 2 + +test -f bsd_converted || exit 1 + +tmpfile=`mktemp /tmp/sysv_makefile.XXXXXX` || tmpfile="tmp.$$" +for i in build/*.mk; do + sed 's/^\.include "\(.*\)"/include \1/' $i >$tmpfile \ + && cp $tmpfile $i +done +rm -f $tmpfile + +rm bsd_converted +exit 0 diff --git a/buildconf b/buildconf index 415d20dcab..c3530e8614 100755 --- a/buildconf +++ b/buildconf @@ -28,4 +28,9 @@ fi rm -f generated_lists +case "`uname`" in +*BSD/OS*) + ./build/bsd_makefile;; +esac + ${MAKE:-make} -s -f build/build.mk AMFLAGS="$automake_flags" diff --git a/configure.in b/configure.in index da06120e41..ce4b237b69 100644 --- a/configure.in +++ b/configure.in @@ -91,6 +91,8 @@ fi AC_PROG_CC AC_AIX +BSD_MAKEFILE=no + case "$host_alias" in *solaris*) CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS";; @@ -98,6 +100,8 @@ case "$host_alias" in CPPFLAGS="$CPPFLAGS -D_BSD_TIMEOFDAY_FLAVOR";; *darwin*|*rhapsody*) CPPFLAGS="$CPPFLAGS -traditional-cpp";; +*bsdi*) + BSD_MAKEFILE=yes;; esac AM_PROG_CC_STDC @@ -814,7 +818,6 @@ changequote([,]) PHP_CONFIGURE_PART(Generating files) PHP_GEN_CONFIG_VARS -touch .deps ALL_OUTPUT_FILES="php4.spec Zend/Makefile build-defs.h $PHP_OUTPUT_FILES" -- 2.40.0