Patches for buildconf and build/buildcheck.sh

Hi! I made these two patches so the buildconf script works on Tru64. --- buildconf Mon Jan 13 10:34:38 2003 +++ .new..buildconf Mon Jan 13 10:33:43 2003 @@ -19,6 +19,10 @@ echo "using default Zend directory" fi -rm -f generated_lists - +rm -rf generated_lists +osf=uname -s +if test "$osf" = "OSF1"; then +gmake -s -f build/build.mk AMFLAGS="$automake_flags" ZENDDIR="$ZENDDIR" +else ${MAKE:-make} -s -f build/build.mk AMFLAGS="$automake_flags" ZENDDIR="$ZENDDIR" +fi --- buildcheck.sh Mon Jan 13 10:36:27 2003 +++ .new..buildcheck.sh Mon Jan 13 10:36:39 2003 @@ -1,8 +1,8 @@ #! /bin/sh # +----------------------------------------------------------------------+ -# | PHP Version 4 | +# | PHP Version 5 | # +----------------------------------------------------------------------+ -# | Copyright (c) 1997-2002 The PHP Group | +# | Copyright (c) 1997-2003 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 | @@ -73,6 +73,8 @@ # libtool 1.4 or newer # Prefer glibtool over libtool for Mac OS X compatibility libtool=which glibtool 2> /dev/null +osf=uname -s +if test "$osf" = "OSF1"; then libtool="/usr/local/bin/libtool"; if test ! -f "$libtool"; then libtool ="" ; fi; fi if test ! -f "$libtool"; then libtool=which libtool; fi lt_pversion=$libtool --version 2>/dev/null|sed -n -e 's/^[^0-9]*//' -e 1's/[- ].*//p' if test "$lt_pversion" = ""; then / Magnus Määttä

--- buildconf Mon Jan 13 10:34:38 2003 +++ .new..buildconf Mon Jan 13 10:33:43 2003 @@ -19,6 +19,10 @@ echo "using default Zend directory" fi -rm -f generated_lists - +rm -rf generated_lists +osf=`uname -s` +if test "$osf" = "OSF1"; then +gmake -s -f build/build.mk AMFLAGS="$automake_flags" ZENDDIR="$ZENDDIR" +else ${MAKE:-make} -s -f build/build.mk AMFLAGS="$automake_flags" ZENDDIR="$ZENDDIR" +fi --- buildcheck.sh Mon Jan 13 10:36:27 2003 +++ .new..buildcheck.sh Mon Jan 13 10:36:39 2003 @@ -1,8 +1,8 @@ #! /bin/sh # +----------------------------------------------------------------------+ -# | PHP Version 4 | +# | PHP Version 5 | # +----------------------------------------------------------------------+ -# | Copyright (c) 1997-2002 The PHP Group | +# | Copyright (c) 1997-2003 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 | @@ -73,6 +73,8 @@ # libtool 1.4 or newer # Prefer glibtool over libtool for Mac OS X compatibility libtool=`which glibtool 2> /dev/null` +osf=`uname -s` +if test "$osf" = "OSF1"; then libtool="/usr/local/bin/libtool"; if test ! -f "$libtool"; then libtool ="" ; fi; fi if test ! -f "$libtool"; then libtool=`which libtool`; fi lt_pversion=`$libtool --version 2>/dev/null|sed -n -e 's/^[^0-9]*//' -e 1's/[- ].*//p'` if test "$lt_pversion" = ""; then