[PHP4BETA] CVS update: php4

Date: Wednesday April 21, 1999 @ 11:52 Author: ssb Update of /repository/php4 In directory php:/tmp/cvs-serv9122 Modified Files: acinclude.m4 Log Message: remove old libtool and automake stuff that was borrowed using 3.0 Index: php4/acinclude.m4 diff -c php4/acinclude.m4:1.2 php4/acinclude.m4:1.3 *** php4/acinclude.m4:1.2 Mon Apr 19 21:03:09 1999 --- php4/acinclude.m4 Wed Apr 21 11:52:42 1999 *************** *** 1,4 **** ! dnl $Id: acinclude.m4,v 1.2 1999/04/20 01:03:09 ssb Exp $ dnl dnl This file contains local autoconf functions. --- 1,4 ---- ! dnl $Id: acinclude.m4,v 1.3 1999/04/21 15:52:42 ssb Exp $ dnl dnl This file contains local autoconf functions. *************** *** 179,373 **** AC_MSG_RESULT(cannot check, guessing no) ]) ]) - - ## libtool.m4 - Configure libtool for the target system. -*-Shell-script-*- - ## Copyright (C) 1996, 1997 Free Software Foundation, Inc. - ## Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 - ## - ## This program is free software; you can redistribute it and/or modify - ## it under the terms of the GNU General Public License as published by - ## the Free Software Foundation; either version 2 of the License, or - ## (at your option) any later version. - ## - ## This program is distributed in the hope that it will be useful, but - ## WITHOUT ANY WARRANTY; without even the implied warranty of - ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - ## General Public License for more details. - ## - ## You should have received a copy of the GNU General Public License - ## along with this program; if not, write to the Free Software - ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - ## - ## As a special exception to the GNU General Public License, if you - ## distribute this file as part of a program that contains a - ## configuration script generated by Autoconf, you may include it under - ## the same distribution terms that you use for the rest of that program. - - # serial 9 AM_PROG_LIBTOOL - AC_DEFUN(AM_PROG_LIBTOOL, - [AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([AC_PROG_CC]) - AC_REQUIRE([AC_PROG_RANLIB]) - AC_REQUIRE([AM_PROG_LD]) - AC_REQUIRE([AC_PROG_LN_S]) - - # Always use our own libtool. - LIBTOOL='$(top_builddir)/libtool' - AC_SUBST(LIBTOOL) - - dnl Allow the --disable-shared flag to stop us from building shared libs. - AC_ARG_ENABLE(shared, - [ --enable-shared build shared libraries [default=yes]], - test "$enableval" = no && libtool_shared=" --disable-shared", - libtool_shared=) - - dnl Allow the --disable-static flag to stop us from building static libs. - AC_ARG_ENABLE(static, - [ --enable-static build static libraries [default=yes]], - test "$enableval" = no && libtool_static=" --disable-static", - libtool_static=) - - libtool_flags="$libtool_shared$libtool_static" - test "$silent" = yes && libtool_flags="$libtool_flags --silent" - test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc" - test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld" - - # Some flags need to be propagated to the compiler or linker for good - # libtool support. - [case "$host" in - *-*-irix6*) - for f in '-32' '-64' '-cckr' '-n32' '-mips1' '-mips2' '-mips3' '-mips4'; do - if echo " $CC $CFLAGS " | egrep -e "[ ]$f[ ]" > /dev/null; then - LD="${LD-ld} $f" - fi - done - ;; - - *-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - CFLAGS="$CFLAGS -belf" - ;; - esac] - - # Actually configure libtool. ac_aux_dir is where install-sh is found. - CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ - LD="$LD" RANLIB="$RANLIB" LN_S="$LN_S" \ - ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \ - $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ - || AC_MSG_ERROR([libtool configure failed]) - ]) - - # AM_PROG_LD - find the path to the GNU or non-GNU linker - AC_DEFUN(AM_PROG_LD, - [AC_ARG_WITH(gnu-ld, - [ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], - test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) - if test "$with_gnu_ld" = yes; then - AC_MSG_CHECKING([for GNU ld]) - else - AC_MSG_CHECKING([for non-GNU ld]) - fi - AC_CACHE_VAL(ac_cv_path_LD, - [case "$LD" in - /*) - ac_cv_path_LD="$LD" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/ld"; then - ac_cv_path_LD="$ac_dir/ld" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU ld|with BFD)' > /dev/null; then - test "$with_gnu_ld" = yes && break - else - test "$with_gnu_ld" != yes && break - fi - fi - done - IFS="$ac_save_ifs" - ;; - esac]) - LD="$ac_cv_path_LD" - if test -n "$LD"; then - AC_MSG_RESULT($LD) - else - AC_MSG_RESULT(no) - fi - test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) - AC_SUBST(LD) - AM_PROG_LD_GNU - ]) - - AC_DEFUN(AM_PROG_LD_GNU, - [AC_CACHE_CHECK([whether we are using GNU ld], ac_cv_prog_gnu_ld, - [# I'd rather use --version here, but apparently some GNU ld's only accept -v. - if $LD -v 2>&1 </dev/null | egrep '(GNU ld|with BFD)' > /dev/null; then - ac_cv_prog_gnu_ld=yes - else - ac_cv_prog_gnu_ld=no - fi]) - ]) - - # the following 'borrwed' from automake until we switch over - # Add --enable-maintainer-mode option to configure. - # From Jim Meyering - - # serial 1 - - AC_DEFUN(AM_MAINTAINER_MODE, - [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) - dnl maintainer-mode is disabled by default - AC_ARG_ENABLE(maintainer-mode, - [ --enable-maintainer-mode enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer], - USE_MAINTAINER_MODE=$enableval, - USE_MAINTAINER_MODE=no) - AC_MSG_RESULT($USE_MAINTAINER_MODE) - if test $USE_MAINTAINER_MODE = yes; then - MAINT= - else - MAINT='#M#' - fi - AC_SUBST(MAINT)dnl - ] - ) - - # another one stolen from automake temporarily - # - # Check to make sure that the build environment is sane. - # - - AC_DEFUN(AM_SANITY_CHECK, - [AC_MSG_CHECKING([whether build environment is sane]) - # Just in case - sleep 1 - echo timestamp > conftestfile - # Do `set' in a subshell so we don't clobber the current shell's - # arguments. Must try -L first in case configure is actually a - # symlink; some systems play weird games with the mod time of symlinks - # (eg FreeBSD returns the mod time of the symlink's containing - # directory). - if ( - set X ls -Lt $srcdir/configure conftestfile 2> /dev/null - if test "$@" = "X"; then - # -L didn't work. - set X ls -t $srcdir/configure conftestfile - fi - test "[$]2" = conftestfile - ) - then - # Ok. - : - else - AC_MSG_ERROR([newly created file is older than distributed files! - Check your system clock]) - fi - rm -f conftest* - AC_MSG_RESULT(yes)]) dnl dnl Stuff to do when setting up a new extension. --- 179,184 ---- -- PHP 4 Beta