Attachment 72472 Details for Bug 142224

[patch] Proposed replacement for php-4.4.0-autoconf1.diff to make php4-unixODBC usable

php-4.4.0-autoconf3.diff (text/plain), 8.12 KB, created by Forgotten User QalJpewZcg on 2006-03-12 23:24:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Forgotten User QalJpewZcg

Created: 2006-03-12 23:24:43 UTC

Size: 8.12 KB

patch

obsolete

>--- acinclude.m4
>+++ acinclude.m4
>@@ -783,13 +783,13 @@
> dnl
> AC_DEFUN([PHP_BUILD_PROGRAM],[
>   OVERALL_TARGET=[]ifelse($1,,php,$1)
>-  php_c_pre='$(CC)'
>+  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
>   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
>-  php_c_post=' && echo > $[@]'
>-  php_cxx_pre='$(CXX)'
>+  php_c_post=
>+  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
>   php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
>-  php_cxx_post=' && echo > $[@]'
>-  php_lo=o
>+  php_cxx_post=
>+  php_lo=lo
> 
>   case $with_pic in
>     yes) pic_setting='-prefer-pic';;
>--- aclocal.m4
>+++ aclocal.m4
>@@ -2771,7 +2771,7 @@
> # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
> case $host_os in
> linux-gnu*) ;;
>-linux*) host=`echo $host | sed 's/^$.*-.*-linux$$.*$$/\1-gnu\2/'`
>+linux*) host=`echo $host | sed 's/^$.*-.*-linux$$.*$$/\1-gnu\2/'`; host_os=$host_os-gnu;;
> esac
> 
> case $host_os in
>--- configure.in
>+++ configure.in
>@@ -125,7 +125,7 @@
> 
> AC_AIX
> 
>-dnl AC_PROG_CXX
>+AC_PROG_CXX
> dnl AC_PROG_CXXCPP
> 
> dnl check for -R, etc. switch
>@@ -238,6 +238,7 @@
> sinclude(Zend/acinclude.m4)
> sinclude(Zend/Zend.m4)
> sinclude(TSRM/tsrm.m4)
>+sinclude(TSRM/threads.m4)
> 
> AC_ARG_WITH([_lib],
> [  --with-_lib             library name [[default: lib]]],
>--- ext/gd/config.m4
>+++ ext/gd/config.m4
>@@ -118,8 +118,8 @@
>       AC_MSG_ERROR([libXpm.(a|so) not found.])
>     fi
> 
>-    for i in include include/X11; do
>-      test -f $GD_XPM_DIR/$i/xpm.h && GD_XPM_INC=$GD_XPM_DIR/include
>+    for i in include include/X11 ../include ../include/X11; do
>+      test -f $GD_XPM_DIR/$i/xpm.h && GD_XPM_INC=$GD_XPM_DIR/$i
>     done
> 
>     if test -z "$GD_XPM_INC"; then
>@@ -282,6 +282,7 @@
>   test "$PHP_PNG_DIR" = "no" && PHP_PNG_DIR=yes
>       
> dnl Various checks for GD features
>+  PHP_ADD_LIBRARY([m])
>   PHP_GD_TTSTR
>   PHP_GD_JISX0208
>   PHP_GD_JPEG
>--- ext/gettext/config.m4
>+++ ext/gettext/config.m4
>@@ -18,7 +18,10 @@
>   GETTEXT_INCDIR=$GETTEXT_DIR/include
>   
>   O_LDFLAGS=$LDFLAGS
>-  LDFLAGS="$LDFLAGS -L$GETTEXT_LIBDIR"
>+  O_LIBS=$LIBS
>+  LIBS="-lc"
>+  LDFLAGS="-lc -L$GETTEXT_LIBDIR"
>+
>   AC_CHECK_LIB(intl, bindtextdomain, [
> 	GETTEXT_LIBS=intl
> 	GETTEXT_CHECK_IN_LIB=intl
>@@ -31,6 +34,7 @@
> 	])
>   )
>   LDFLAGS=$O_LDFLAGS
>+  LIBS=$O_LIBS
> 
>   AC_DEFINE(HAVE_LIBINTL,1,[ ])
>   PHP_NEW_EXTENSION(gettext, gettext.c, $ext_shared)
>--- ext/imap/config.m4
>+++ ext/imap/config.m4
>@@ -137,7 +137,7 @@
> #endif
>     ],[
>       AC_DEFINE(HAVE_IMAP2001, 1, [ ])
>-    ],[])
>+    ])
>     CPPFLAGS=$old_CPPFLAGS
> 
>     PHP_CHECK_LIBRARY(pam, pam_start, 
>--- ext/java/config.m4
>+++ ext/java/config.m4
>@@ -160,7 +160,6 @@
>       AC_MSG_ERROR([unable to find Java VM libraries in $PHP_JAVA])
>     fi
> 
>-    PHP_ADD_LIBPATH($JAVA_LIBPATH)
>     JAVA_CFLAGS="$JAVA_CFLAGS '-DJAVALIB=\"$JAVA_LIBPATH/$java_libext\"'"
>   fi
> 
>--- ext/mcal/config.m4
>+++ ext/mcal/config.m4
>@@ -6,7 +6,7 @@
> [  --with-mcal[=DIR]       Include MCAL support.])
> 
> if test "$PHP_MCAL" != "no"; then
>-  MCAL_DEFAULT_SEARCH=/usr/local
>+  MCAL_DEFAULT_SEARCH=/usr
>   if test "$PHP_MCAL" = "yes"; then
>     MCAL_DIR=$MCAL_DEFAULT_SEARCH
>   else
>--- ext/mysql/config.m4
>+++ ext/mysql/config.m4
>@@ -2,19 +2,16 @@
> dnl $Id: config.m4,v 1.54.2.3 2004/12/30 07:02:17 sniper Exp $
> dnl
> 
>-sinclude(ext/mysql/libmysql/acinclude.m4)
>-sinclude(ext/mysql/libmysql/mysql.m4)
> sinclude(libmysql/acinclude.m4)
> sinclude(libmysql/mysql.m4)
> 
>+PHP_REQUIRE_CXX
>+
> AC_DEFUN([MYSQL_LIB_CHK], [
>-  str="$MYSQL_DIR/$1/libmysqlclient.*"
>-  for j in `echo $str`; do
>-    if test -r $j; then
>-      MYSQL_LIB_DIR=$MYSQL_DIR/$1
>-      break 2
>-    fi
>-  done
>+  if test -r "$MYSQL_DIR/$1/libmysqlclient.so"; then
>+    MYSQL_LIB_DIR=$MYSQL_DIR/$1
>+    break
>+  fi
> ])
> 
> AC_DEFUN([PHP_MYSQL_SOCKET_SEARCH], [
>--- ext/odbc/config.m4
>+++ ext/odbc/config.m4
>@@ -401,7 +401,7 @@
>   fi
>   if test "$withval" != "no"; then
>     PHP_ADD_LIBRARY_WITH_PATH(iodbc, $withval/$with__lib)
>-    PHP_ADD_INCLUDE($withval/include, 1)
>+    PHP_ADD_INCLUDE($withval/include/iodbc, 1)
>     ODBC_TYPE=iodbc
>     ODBC_INCLUDE=-I$withval/include
>     ODBC_LFLAGS=-L$withval/$with__lib
>@@ -553,5 +553,46 @@
>   PHP_SUBST_OLD(ODBC_LFLAGS)
>   PHP_SUBST_OLD(ODBC_TYPE)
> 
>-  PHP_NEW_EXTENSION(odbc, php_odbc.c, $ext_shared,, $ODBC_INCLUDE)
>+  ext_builddir=[]PHP_EXT_BUILDDIR(odbc)
>+  ext_srcdir=[]PHP_EXT_SRCDIR(odbc)
>+  ac_extra=$ODBC_INCLUDE
>+
>+  if test "$ext_shared" != "shared" && test "$ext_shared" != "yes"; then
>+dnl ---------------------------------------------- Static module
>+
>+    PHP_ADD_SOURCES(PHP_EXT_DIR(odbc),php_odbc.c,$ac_extra,)
>+    EXT_STATIC="$EXT_STATIC odbc"
>+    if test "$ext_shared" != "nocli"; then
>+      EXT_CLI_STATIC="$EXT_CLI_STATIC odbc"
>+    fi
>+  else
>+dnl ---------------------------------------------- Shared module
>+    PHP_ADD_SOURCES_X(PHP_EXT_DIR(odbc),php_odbc.c,$ac_extra,shared_objects_odbc,yes)
>+  install_modules="install-modules"
>+
>+  case $host_alias in
>+    *darwin*[)]
>+      suffix=so
>+      link_cmd='ifelse(,,[$(CC)],[$(CXX)]) -dynamic -flat_namespace -bundle -undefined suppress $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o [$]@ $(EXTRA_LDFLAGS) $(shared_objects_odbc) $(ODBC_SHARED_LIBADD)'
>+      ;;
>+    *[)]
>+      suffix=la
>+      link_cmd='$(LIBTOOL) --mode=link ifelse(,,[$(CC)],[$(CXX)]) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o [$]@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_odbc) $(ODBC_SHARED_LIBADD)'
>+      ;;
>+  esac
>+
>+  PHP_MODULES="$PHP_MODULES \$(phplibdir)/unixODBC.la"
>+  PHP_SUBST(shared_objects_odbc)
>+  cat >>Makefile.objects<<EOF
>+\$(phplibdir)/unixODBC.la: $ext_builddir/unixODBC.la
>+	\$(LIBTOOL) --mode=install cp $ext_builddir/unixODBC.la \$(phplibdir)
>+
>+$ext_builddir/unixODBC.la: \$(shared_objects_odbc) \$(ODBC_SHARED_DEPENDENCIES)
>+	$link_cmd
>+
>+EOF
>+    AC_DEFINE_UNQUOTED([COMPILE_DL_ODBC], 1, Whether to build ODBC as dynamic module)
>+  fi
>+
>+  PHP_ADD_BUILD_DIR($ext_builddir)
> fi
>--- ext/qtdom/config.m4
>+++ ext/qtdom/config.m4
>@@ -28,7 +28,7 @@
>     AC_MSG_ERROR([qdom.h not found.])
>   fi
> 
>-  PHP_ADD_LIBRARY_WITH_PATH(qt, $QTDOM_LIBDIR, QTDOM_SHARED_LIBADD)
>+  PHP_ADD_LIBRARY_WITH_PATH(qt-mt, $QTDOM_LIBDIR, QTDOM_SHARED_LIBADD)
>   PHP_ADD_INCLUDE($QTDOM_INCDIR)
>   PHP_NEW_EXTENSION(qtdom, qtdom.c qtdom_qt.cpp, $ext_shared)
>   PHP_SUBST(QTDOM_SHARED_LIBADD)
>--- sapi/apache/config.m4
>+++ sapi/apache/config.m4
>@@ -101,7 +101,7 @@
>                       \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
>                        $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
>                              -S SYSCONFDIR='$APXS_SYSCONFDIR' \
>-                             -i -a -n php4 $SAPI_SHARED"
>+                             -i -n php4 $SAPI_SHARED"
>     fi
>   fi
> 
>--- sapi/apache2handler/config.m4
>+++ sapi/apache2handler/config.m4
>@@ -75,7 +75,7 @@
>                 \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
>                  $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
>                        -S SYSCONFDIR='$APXS_SYSCONFDIR' \
>-                       -i -a -n php4"
>+                       -i -n php4"
>   fi
> 
>   case $host_alias in
>--- sapi/servlet/config.m4
>+++ sapi/servlet/config.m4
>@@ -34,14 +34,15 @@
>     AC_DEFINE(SAPI_SERVLET, 1, [Whether you use Servlet])
> 
>     INSTALL_IT="\$(mkinstalldirs) \$(libdir)"
>-    INSTALL_IT="$INSTALL_IT; \$(INSTALL) -m 0755 \$(top_srcdir)/sapi/servlet/phpsrvlt.jar \$(libdir)"
>-    INSTALL_IT="$INSTALL_IT; \$(INSTALL) -m 0755 $SAPI_SHARED \$(libdir)"
>+    INSTALL_IT="$INSTALL_IT; \$(INSTALL) -m 0755 \$(top_srcdir)/sapi/servlet/phpsrvlt.jar \$(INSTALL_ROOT)\$(libdir)"
>+    INSTALL_IT="$INSTALL_IT; \$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)\$(libdir)"
>     PHP_SAPI=servlet
>+    PHP_MODULES=sapi/servlet/phpsrvlt.jar
>     PHP_BUILD_THREAD_SAFE
>     EXTRA_INCLUDES="$EXTRA_INCLUDES \$(JAVA_INCLUDE)"
>     PHP_SELECT_SAPI(servlet, shared, servlet.c)
>     PHP_ADD_SOURCES(/sapi/servlet, java.c,, sapi)
>-    PHP_ADD_MAKEFILE_FRAGMENT(sapi/servlet/Makefile.frag)
>+    PHP_ADD_MAKEFILE_FRAGMENT(sapi/servlet/Makefile.frag, sapi/servlet, sapi/servlet)
> 
>     AC_MSG_RESULT(yes)
>   else
>--- TSRM/tsrm.m4
>+++ TSRM/tsrm.m4
>@@ -68,7 +68,6 @@
> ])
> 
> sinclude(threads.m4)
>-sinclude(TSRM/threads.m4)
> 
> AC_DEFUN([TSRM_CHECK_PTHREADS],[
>

Actions: View | Diff

Attachments on bug 142224: 62729 | 72472