cvs: php4 / .cvsignore acinclude.m4 buildconf configure.in /build bsd_makefile fastgen.sh sysv_makefile

sas Tue Sep 26 04:19:39 2000 EDT Added files: /php4/build bsd_makefile sysv_makefile Modified files: /php4 .cvsignore acinclude.m4 buildconf configure.in /php4/build fastgen.sh Log: 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. Index: php4/.cvsignore diff -u php4/.cvsignore:1.33 php4/.cvsignore:1.34 --- php4/.cvsignore:1.33 Mon Jun 26 06:23:03 2000 +++ php4/.cvsignore Tue Sep 26 04:19:38 2000 @@ -1,6 +1,7 @@ Makefile acconfig.h aclocal.m4 +bsd_converted build-defs.h buildmk.stamp buildconf.stamp Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.105 php4/acinclude.m4:1.106 --- php4/acinclude.m4:1.105 Thu Sep 21 16:18:25 2000 +++ php4/acinclude.m4 Tue Sep 26 04:19:38 2000 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.105 2000/09/21 23:18:25 sas Exp $ +dnl $Id: acinclude.m4,v 1.106 2000/09/26 11:19:38 sas Exp $ dnl dnl This file contains local autoconf functions. @@ -310,7 +310,7 @@ ]) 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,[ Index: php4/buildconf diff -u php4/buildconf:1.49 php4/buildconf:1.50 --- php4/buildconf:1.49 Wed Aug 23 22:55:19 2000 +++ php4/buildconf Tue Sep 26 04:19:38 2000 @@ -1,5 +1,5 @@ #!/bin/sh -# $Id: buildconf,v 1.49 2000/08/24 05:55:19 sas Exp $ +# $Id: buildconf,v 1.50 2000/09/26 11:19:38 sas Exp $ supplied_flag=$1 @@ -27,5 +27,10 @@ fi rm -f generated_lists + +case "uname" in +*BSD/OS*) + ./build/bsd_makefile;; +esac ${MAKE:-make} -s -f build/build.mk AMFLAGS="$automake_flags" Index: php4/configure.in diff -u php4/configure.in:1.182 php4/configure.in:1.183 --- php4/configure.in:1.182 Tue Sep 19 10:36:36 2000 +++ php4/configure.in Tue Sep 26 04:19:38 2000 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.182 2000/09/19 17:36:36 sas Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.183 2000/09/26 11:19:38 sas Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -91,6 +91,8 @@ AC_PROG_CC AC_AIX +BSD_MAKEFILE=no + case "$host_alias" in *solaris*) CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS";; @@ -98,6 +100,8 @@ 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 @@ PHP_CONFIGURE_PART(Generating files) PHP_GEN_CONFIG_VARS -touch .deps ALL_OUTPUT_FILES="php4.spec Zend/Makefile build-defs.h $PHP_OUTPUT_FILES" Index: php4/build/fastgen.sh diff -u php4/build/fastgen.sh:1.8 php4/build/fastgen.sh:1.9 --- php4/build/fastgen.sh:1.8 Sat Aug 19 22:39:37 2000 +++ php4/build/fastgen.sh Tue Sep 26 04:19:38 2000 @@ -16,7 +16,7 @@ # | Authors: Sascha Schumann <sascha@schumann.cx> | # +----------------------------------------------------------------------+ # -# $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 @@ mkdir_p=$1 shift +bsd_makefile=$1 +shift + top_srcdir=(cd $srcdir; pwd) top_builddir=pwd @@ -33,13 +36,33 @@ else mkdir_p="$top_srcdir/helpers/mkdir.sh" fi + +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 <<EOF |sed 's/^include \(.*\)/.include "\1"/' >$makefile +top_srcdir = $top_srcdir +top_builddir = $top_builddir +srcdir = $top_srcdir/$dir +builddir = $top_builddir/$dir +VPATH = $top_srcdir/$dir +EOF -for makefile in $@; do - echo "creating $makefile" - dir=echo $makefile|sed 's%/*[^/][^/]*$%%' - $mkdir_p "$dir/" + 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 <<EOF >$makefile + cat - $top_srcdir/$makefile.in <<EOF >$makefile top_srcdir = $top_srcdir top_builddir = $top_builddir srcdir = $top_srcdir/$dir @@ -47,5 +70,7 @@ VPATH = $top_srcdir/$dir EOF - test -z "$dir" || touch $dir/.deps -done + test -z "$dir" && dir=. + touch $dir/.deps + done +fi