jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SWIG now runs the PHP testsuite using PHP5, not PHP4. PHP4 is

Browse source 
essentially obsolete now, so we care much more about solid PHP5
support.


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@10428 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Olly Betts 2008-05-09 11:26:37 +00:00
commit 136f2c7041
3 changed files with 24 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
CHANGES.current
View file

@ -1,6 +1,11 @@
Version 1.3.36 (in progress)
=============================
05/09/2008: olly
SWIG now runs the PHP testsuite using PHP5, not PHP4. PHP4 is
essentially obsolete now, so we care much more about solid PHP5
support.
05/07/2008: wsfulton
STL fixes when using %import rather than %include and the Solaris Workshop
compiler and the Roguewave STL.

6
Examples/Makefile.in
View file

@ -705,7 +705,7 @@ PHP4_INCLUDE = @PHP4INC@
PHP4_SO = @PHP4_SO@
php4: $(SRCS)
$(SWIG) -php4 $(SWIGOPT) $(INTERFACE)
$(SWIG) -php5 $(SWIGOPT) $(INTERFACE)
$(CC) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(PHP4_INCLUDE)
$(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(PHP4_SO)
@ -714,7 +714,7 @@ php4: $(SRCS)
# --------------------------------------------------------------------
php4_cpp: $(SRCS)
$(SWIG) -php4 -cppext cxx -c++ $(SWIGOPT) $(INTERFACE)
$(SWIG) -php5 -cppext cxx -c++ $(SWIGOPT) $(INTERFACE)
$(CXX) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(PHP4_INCLUDE)
$(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(PHP4_SO)
@ -726,7 +726,7 @@ PHP4=@PHP4@
SCRIPT ?= runme.php4
php4_run:
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(PHP4) -q -d extension_dir=. $(SCRIPT)
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH $(PHP4) -n -q -d extension_dir=. $(SCRIPT)
# -----------------------------------------------------------------
# Cleaning the PHP4 examples

26
configure.in
View file

@ -1236,7 +1236,7 @@ if test x"${PHP4BIN}" = xno -o x"${with_alllang}" = xno ; then
else
if test "x$PHP4BIN" = xyes; then
AC_CHECK_PROGS(PHP4, php5 php php4)
AC_CHECK_PROGS(PHP4, [php5 php])
else
PHP4=$PHP4BIN
fi
@ -1244,18 +1244,24 @@ else
AC_MSG_CHECKING(for PHP header files)
dnl /usr/bin/php5 -> /usr/bin/php-config5
case $PHP4 in
*[[45]])
PHP4CONFIG=`echo "$PHP4"|sed 's/\([[45]]\)$/-config\1/'` ;;
*5)
PHP4CONFIG=`echo "$PHP4"|sed 's/5$/-config5/'` ;;
*)
PHP4CONFIG=$PHP4-config ;;
esac
PHP4INC=`$PHP4CONFIG --includes 2>/dev/null`
if test -n "$PHP4INC"; then
AC_MSG_RESULT($PHP4INC)
else
AC_MSG_RESULT(not found)
fi
php_version=`$PHP4CONFIG --version 2>/dev/null`
case $php_version in
5*)
PHP4INC=`$PHP4CONFIG --includes 2>/dev/null`
if test -n "$PHP4INC"; then
AC_MSG_RESULT($PHP4INC)
else
AC_MSG_RESULT(not found)
fi
;;
*)
AC_MSG_RESULT([found PHP $version, but only PHP 5 is supported]) ;;
esac
fi
AC_SUBST(PHP4)
AC_SUBST(PHP4INC)