Attachment #72472 for bug #142224

View | Details | Raw Unified | Return to bug 142224
Collapse All | Expand All




++ acinclude.m4

dnl
AC_DEFUN([PHP_BUILD_PROGRAM],[
  OVERALL_TARGET=[]ifelse($1,,php,$1)
  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
  php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
  php_c_post=
  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
  php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
  php_cxx_post=
  php_lo=lo

  case $with_pic in
    yes) pic_setting='-prefer-pic';;
++ aclocal.m4

# 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/'`; host_os=$host_os-gnu;;
esac

case $host_os in
++ configure.in


AC_AIX

AC_PROG_CXX
dnl AC_PROG_CXXCPP

dnl check for -R, etc. switch

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

      AC_MSG_ERROR([libXpm.(a|so) not found.])
    fi

    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

  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

  GETTEXT_INCDIR=$GETTEXT_DIR/include
  
  O_LDFLAGS=$LDFLAGS
  O_LIBS=$LIBS
  LIBS="-lc"
  LDFLAGS="-lc -L$GETTEXT_LIBDIR"

  AC_CHECK_LIB(intl, bindtextdomain, [
	GETTEXT_LIBS=intl
	GETTEXT_CHECK_IN_LIB=intl

	])
  )
  LDFLAGS=$O_LDFLAGS
  LIBS=$O_LIBS

  AC_DEFINE(HAVE_LIBINTL,1,[ ])
  PHP_NEW_EXTENSION(gettext, gettext.c, $ext_shared)
++ ext/imap/config.m4

#endif
    ],[
      AC_DEFINE(HAVE_IMAP2001, 1, [ ])
    ])
    CPPFLAGS=$old_CPPFLAGS

    PHP_CHECK_LIBRARY(pam, pam_start, 
++ ext/java/config.m4

      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

[  --with-mcal[=DIR]       Include MCAL support.])

if test "$PHP_MCAL" != "no"; then
  MCAL_DEFAULT_SEARCH=/usr
  if test "$PHP_MCAL" = "yes"; then
    MCAL_DIR=$MCAL_DEFAULT_SEARCH
  else
++ ext/mysql/config.m4

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], [
  if test -r "$MYSQL_DIR/$1/libmysqlclient.so"; then
    MYSQL_LIB_DIR=$MYSQL_DIR/$1
    break
  fi
      break 2
    fi
  done
])

AC_DEFUN([PHP_MYSQL_SOCKET_SEARCH], [
++ ext/odbc/config.m4

  fi
  if test "$withval" != "no"; then
    PHP_ADD_LIBRARY_WITH_PATH(iodbc, $withval/$with__lib)
    PHP_ADD_INCLUDE($withval/include/iodbc, 1)
    ODBC_TYPE=iodbc
    ODBC_INCLUDE=-I$withval/include
    ODBC_LFLAGS=-L$withval/$with__lib

  PHP_SUBST_OLD(ODBC_LFLAGS)
  PHP_SUBST_OLD(ODBC_TYPE)

  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

    AC_MSG_ERROR([qdom.h not found.])
  fi

  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

                      \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
                       $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
                             -S SYSCONFDIR='$APXS_SYSCONFDIR' \
                             -i -n php4 $SAPI_SHARED"
    fi
  fi

++ sapi/apache2handler/config.m4

                \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
                 $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
                       -S SYSCONFDIR='$APXS_SYSCONFDIR' \
                       -i -n php4"
  fi

  case $host_alias in
++ sapi/servlet/config.m4

    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 \$(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, sapi/servlet, sapi/servlet)

    AC_MSG_RESULT(yes)
  else
++ TSRM/tsrm.m4

])

sinclude(threads.m4)
sinclude(TSRM/threads.m4)

AC_DEFUN([TSRM_CHECK_PTHREADS],[
		

Return to bug 142224

Line Link Here

(-)file_not_specified_in_diff (-46 / +89 lines)
0	-- acinclude.m4	0	++ acinclude.m4
Lines 783-795 Link Here
783	dnl	783	dnl
784	AC_DEFUN([PHP_BUILD_PROGRAM],[	784	AC_DEFUN([PHP_BUILD_PROGRAM],[
785	OVERALL_TARGET=[]ifelse($1,,php,$1)	785	OVERALL_TARGET=[]ifelse($1,,php,$1)
786	php_c_pre='$(CC)'	786	php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
787	php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'	787	php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
788	php_c_post=' && echo > $[@]'	788	php_c_post=
789	php_cxx_pre='$(CXX)'	789	php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
790	php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'	790	php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
791	php_cxx_post=' && echo > $[@]'	791	php_cxx_post=
792	php_lo=o	792	php_lo=lo
793		793
794	case $with_pic in	794	case $with_pic in
795	yes) pic_setting='-prefer-pic';;	795	yes) pic_setting='-prefer-pic';;
796	-- aclocal.m4	796	++ aclocal.m4
Lines 2771-2777 Link Here
2771	# Transform linux* to --linux-gnu*, to support old configure scripts.	2771	# Transform linux* to --linux-gnu*, to support old configure scripts.
2772	case $host_os in	2772	case $host_os in
2773	linux-gnu*) ;;	2773	linux-gnu*) ;;
2774	linux) host=`echo $host \| sed 's/^\(.-.-linux\)\(.\)$/\1-gnu\2/'`	2774	linux) host=`echo $host \| sed 's/^\(.-.-linux\)\(.\)$/\1-gnu\2/'`; host_os=$host_os-gnu;;
2775	esac	2775	esac
2776		2776
2777	case $host_os in	2777	case $host_os in
2778	-- configure.in	2778	++ configure.in
Lines 125-131 Link Here
125		125
126	AC_AIX	126	AC_AIX
127		127
128	dnl AC_PROG_CXX	128	AC_PROG_CXX
129	dnl AC_PROG_CXXCPP	129	dnl AC_PROG_CXXCPP
130		130
131	dnl check for -R, etc. switch	131	dnl check for -R, etc. switch
Lines 238-243 Link Here
238	sinclude(Zend/acinclude.m4)	238	sinclude(Zend/acinclude.m4)
239	sinclude(Zend/Zend.m4)	239	sinclude(Zend/Zend.m4)
240	sinclude(TSRM/tsrm.m4)	240	sinclude(TSRM/tsrm.m4)
		241	sinclude(TSRM/threads.m4)
241		242
242	AC_ARG_WITH([_lib],	243	AC_ARG_WITH([_lib],
243	[ --with-_lib library name [[default: lib]]],	244	[ --with-_lib library name [[default: lib]]],
244	-- ext/gd/config.m4	245	++ ext/gd/config.m4
Lines 118-125 Link Here
118	AC_MSG_ERROR([libXpm.(a\|so) not found.])	118	AC_MSG_ERROR([libXpm.(a\|so) not found.])
119	fi	119	fi
120		120
121	for i in include include/X11; do	121	for i in include include/X11 ../include ../include/X11; do
122	test -f $GD_XPM_DIR/$i/xpm.h && GD_XPM_INC=$GD_XPM_DIR/include	122	test -f $GD_XPM_DIR/$i/xpm.h && GD_XPM_INC=$GD_XPM_DIR/$i
123	done	123	done
124		124
125	if test -z "$GD_XPM_INC"; then	125	if test -z "$GD_XPM_INC"; then
Lines 282-287 Link Here
282	test "$PHP_PNG_DIR" = "no" && PHP_PNG_DIR=yes	282	test "$PHP_PNG_DIR" = "no" && PHP_PNG_DIR=yes
283		283
284	dnl Various checks for GD features	284	dnl Various checks for GD features
		285	PHP_ADD_LIBRARY([m])
285	PHP_GD_TTSTR	286	PHP_GD_TTSTR
286	PHP_GD_JISX0208	287	PHP_GD_JISX0208
287	PHP_GD_JPEG	288	PHP_GD_JPEG
288	-- ext/gettext/config.m4	289	++ ext/gettext/config.m4
Lines 18-24 Link Here
18	GETTEXT_INCDIR=$GETTEXT_DIR/include	18	GETTEXT_INCDIR=$GETTEXT_DIR/include
19		19
20	O_LDFLAGS=$LDFLAGS	20	O_LDFLAGS=$LDFLAGS
21	LDFLAGS="$LDFLAGS -L$GETTEXT_LIBDIR"	21	O_LIBS=$LIBS
		22	LIBS="-lc"
		23	LDFLAGS="-lc -L$GETTEXT_LIBDIR"
		24
22	AC_CHECK_LIB(intl, bindtextdomain, [	25	AC_CHECK_LIB(intl, bindtextdomain, [
23	GETTEXT_LIBS=intl	26	GETTEXT_LIBS=intl
24	GETTEXT_CHECK_IN_LIB=intl	27	GETTEXT_CHECK_IN_LIB=intl
Lines 31-36 Link Here
31	])	34	])
32	)	35	)
33	LDFLAGS=$O_LDFLAGS	36	LDFLAGS=$O_LDFLAGS
		37	LIBS=$O_LIBS
34		38
35	AC_DEFINE(HAVE_LIBINTL,1,[ ])	39	AC_DEFINE(HAVE_LIBINTL,1,[ ])
36	PHP_NEW_EXTENSION(gettext, gettext.c, $ext_shared)	40	PHP_NEW_EXTENSION(gettext, gettext.c, $ext_shared)
37	-- ext/imap/config.m4	41	++ ext/imap/config.m4
Lines 137-143 Link Here
137	#endif	137	#endif
138	],[	138	],[
139	AC_DEFINE(HAVE_IMAP2001, 1, [ ])	139	AC_DEFINE(HAVE_IMAP2001, 1, [ ])
140	],[])	140	])
141	CPPFLAGS=$old_CPPFLAGS	141	CPPFLAGS=$old_CPPFLAGS
142		142
143	PHP_CHECK_LIBRARY(pam, pam_start,	143	PHP_CHECK_LIBRARY(pam, pam_start,
144	-- ext/java/config.m4	144	++ ext/java/config.m4
Lines 160-166 Link Here
160	AC_MSG_ERROR([unable to find Java VM libraries in $PHP_JAVA])	160	AC_MSG_ERROR([unable to find Java VM libraries in $PHP_JAVA])
161	fi	161	fi
162		162
163	PHP_ADD_LIBPATH($JAVA_LIBPATH)
164	JAVA_CFLAGS="$JAVA_CFLAGS '-DJAVALIB=\"$JAVA_LIBPATH/$java_libext\"'"	163	JAVA_CFLAGS="$JAVA_CFLAGS '-DJAVALIB=\"$JAVA_LIBPATH/$java_libext\"'"
165	fi	164	fi
166		165
167	-- ext/mcal/config.m4	166	++ ext/mcal/config.m4
Lines 6-12 Link Here
6	[ --with-mcal[=DIR] Include MCAL support.])	6	[ --with-mcal[=DIR] Include MCAL support.])
7		7
8	if test "$PHP_MCAL" != "no"; then	8	if test "$PHP_MCAL" != "no"; then
9	MCAL_DEFAULT_SEARCH=/usr/local	9	MCAL_DEFAULT_SEARCH=/usr
10	if test "$PHP_MCAL" = "yes"; then	10	if test "$PHP_MCAL" = "yes"; then
11	MCAL_DIR=$MCAL_DEFAULT_SEARCH	11	MCAL_DIR=$MCAL_DEFAULT_SEARCH
12	else	12	else
13	-- ext/mysql/config.m4	13	++ ext/mysql/config.m4
Lines 2-20 Link Here
2	dnl $Id: config.m4,v 1.54.2.3 2004/12/30 07:02:17 sniper Exp $	2	dnl $Id: config.m4,v 1.54.2.3 2004/12/30 07:02:17 sniper Exp $
3	dnl	3	dnl
4		4
5	sinclude(ext/mysql/libmysql/acinclude.m4)
6	sinclude(ext/mysql/libmysql/mysql.m4)
7	sinclude(libmysql/acinclude.m4)	5	sinclude(libmysql/acinclude.m4)
8	sinclude(libmysql/mysql.m4)	6	sinclude(libmysql/mysql.m4)
9		7
		8	PHP_REQUIRE_CXX
		9
10	AC_DEFUN([MYSQL_LIB_CHK], [	10	AC_DEFUN([MYSQL_LIB_CHK], [
11	str="$MYSQL_DIR/$1/libmysqlclient.*"	11	if test -r "$MYSQL_DIR/$1/libmysqlclient.so"; then
12	for j in `echo $str`; do	12	MYSQL_LIB_DIR=$MYSQL_DIR/$1
13	if test -r $j; then	13	break
14	MYSQL_LIB_DIR=$MYSQL_DIR/$1	14	fi
15	break 2
16	fi
17	done
18	])	15	])
19		16
20	AC_DEFUN([PHP_MYSQL_SOCKET_SEARCH], [	17	AC_DEFUN([PHP_MYSQL_SOCKET_SEARCH], [
21	-- ext/odbc/config.m4	18	++ ext/odbc/config.m4
Lines 401-407 Link Here
401	fi	401	fi
402	if test "$withval" != "no"; then	402	if test "$withval" != "no"; then
403	PHP_ADD_LIBRARY_WITH_PATH(iodbc, $withval/$with__lib)	403	PHP_ADD_LIBRARY_WITH_PATH(iodbc, $withval/$with__lib)
404	PHP_ADD_INCLUDE($withval/include, 1)	404	PHP_ADD_INCLUDE($withval/include/iodbc, 1)
405	ODBC_TYPE=iodbc	405	ODBC_TYPE=iodbc
406	ODBC_INCLUDE=-I$withval/include	406	ODBC_INCLUDE=-I$withval/include
407	ODBC_LFLAGS=-L$withval/$with__lib	407	ODBC_LFLAGS=-L$withval/$with__lib
Lines 553-557 Link Here
553	PHP_SUBST_OLD(ODBC_LFLAGS)	553	PHP_SUBST_OLD(ODBC_LFLAGS)
554	PHP_SUBST_OLD(ODBC_TYPE)	554	PHP_SUBST_OLD(ODBC_TYPE)
555		555
556	PHP_NEW_EXTENSION(odbc, php_odbc.c, $ext_shared,, $ODBC_INCLUDE)	556	ext_builddir=[]PHP_EXT_BUILDDIR(odbc)
		557	ext_srcdir=[]PHP_EXT_SRCDIR(odbc)
		558	ac_extra=$ODBC_INCLUDE
		559
		560	if test "$ext_shared" != "shared" && test "$ext_shared" != "yes"; then
		561	dnl ---------------------------------------------- Static module
		562
		563	PHP_ADD_SOURCES(PHP_EXT_DIR(odbc),php_odbc.c,$ac_extra,)
		564	EXT_STATIC="$EXT_STATIC odbc"
		565	if test "$ext_shared" != "nocli"; then
		566	EXT_CLI_STATIC="$EXT_CLI_STATIC odbc"
		567	fi
		568	else
		569	dnl ---------------------------------------------- Shared module
		570	PHP_ADD_SOURCES_X(PHP_EXT_DIR(odbc),php_odbc.c,$ac_extra,shared_objects_odbc,yes)
		571	install_modules="install-modules"
		572
		573	case $host_alias in
		574	darwin[)]
		575	suffix=so
		576	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)'
		577	;;
		578	*[)]
		579	suffix=la
		580	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)'
		581	;;
		582	esac
		583
		584	PHP_MODULES="$PHP_MODULES \$(phplibdir)/unixODBC.la"
		585	PHP_SUBST(shared_objects_odbc)
		586	cat >>Makefile.objects<<EOF
		587	\$(phplibdir)/unixODBC.la: $ext_builddir/unixODBC.la
		588	\$(LIBTOOL) --mode=install cp $ext_builddir/unixODBC.la \$(phplibdir)
		589
		590	$ext_builddir/unixODBC.la: \$(shared_objects_odbc) \$(ODBC_SHARED_DEPENDENCIES)
		591	$link_cmd
		592
		593	EOF
		594	AC_DEFINE_UNQUOTED([COMPILE_DL_ODBC], 1, Whether to build ODBC as dynamic module)
		595	fi
		596
		597	PHP_ADD_BUILD_DIR($ext_builddir)
557	fi	598	fi
558	-- ext/qtdom/config.m4	599	++ ext/qtdom/config.m4
Lines 28-34 Link Here
28	AC_MSG_ERROR([qdom.h not found.])	28	AC_MSG_ERROR([qdom.h not found.])
29	fi	29	fi
30		30
31	PHP_ADD_LIBRARY_WITH_PATH(qt, $QTDOM_LIBDIR, QTDOM_SHARED_LIBADD)	31	PHP_ADD_LIBRARY_WITH_PATH(qt-mt, $QTDOM_LIBDIR, QTDOM_SHARED_LIBADD)
32	PHP_ADD_INCLUDE($QTDOM_INCDIR)	32	PHP_ADD_INCLUDE($QTDOM_INCDIR)
33	PHP_NEW_EXTENSION(qtdom, qtdom.c qtdom_qt.cpp, $ext_shared)	33	PHP_NEW_EXTENSION(qtdom, qtdom.c qtdom_qt.cpp, $ext_shared)
34	PHP_SUBST(QTDOM_SHARED_LIBADD)	34	PHP_SUBST(QTDOM_SHARED_LIBADD)
35	-- sapi/apache/config.m4	35	++ sapi/apache/config.m4
Lines 101-107 Link Here
101	\$(mkinstalldirs) '$APXS_SYSCONFDIR' && \	101	\$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
102	$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \	102	$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
103	-S SYSCONFDIR='$APXS_SYSCONFDIR' \	103	-S SYSCONFDIR='$APXS_SYSCONFDIR' \
104	-i -a -n php4 $SAPI_SHARED"	104	-i -n php4 $SAPI_SHARED"
105	fi	105	fi
106	fi	106	fi
107		107
108	-- sapi/apache2handler/config.m4	108	++ sapi/apache2handler/config.m4
Lines 75-81 Link Here
75	\$(mkinstalldirs) '$APXS_SYSCONFDIR' && \	75	\$(mkinstalldirs) '$APXS_SYSCONFDIR' && \
76	$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \	76	$APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
77	-S SYSCONFDIR='$APXS_SYSCONFDIR' \	77	-S SYSCONFDIR='$APXS_SYSCONFDIR' \
78	-i -a -n php4"	78	-i -n php4"
79	fi	79	fi
80		80
81	case $host_alias in	81	case $host_alias in
82	-- sapi/servlet/config.m4	82	++ sapi/servlet/config.m4
Lines 34-47 Link Here
34	AC_DEFINE(SAPI_SERVLET, 1, [Whether you use Servlet])	34	AC_DEFINE(SAPI_SERVLET, 1, [Whether you use Servlet])
35		35
36	INSTALL_IT="\$(mkinstalldirs) \$(libdir)"	36	INSTALL_IT="\$(mkinstalldirs) \$(libdir)"
37	INSTALL_IT="$INSTALL_IT; \$(INSTALL) -m 0755 \$(top_srcdir)/sapi/servlet/phpsrvlt.jar \$(libdir)"	37	INSTALL_IT="$INSTALL_IT; \$(INSTALL) -m 0755 \$(top_srcdir)/sapi/servlet/phpsrvlt.jar \$(INSTALL_ROOT)\$(libdir)"
38	INSTALL_IT="$INSTALL_IT; \$(INSTALL) -m 0755 $SAPI_SHARED \$(libdir)"	38	INSTALL_IT="$INSTALL_IT; \$(INSTALL) -m 0755 $SAPI_SHARED \$(INSTALL_ROOT)\$(libdir)"
39	PHP_SAPI=servlet	39	PHP_SAPI=servlet
		40	PHP_MODULES=sapi/servlet/phpsrvlt.jar
40	PHP_BUILD_THREAD_SAFE	41	PHP_BUILD_THREAD_SAFE
41	EXTRA_INCLUDES="$EXTRA_INCLUDES \$(JAVA_INCLUDE)"	42	EXTRA_INCLUDES="$EXTRA_INCLUDES \$(JAVA_INCLUDE)"
42	PHP_SELECT_SAPI(servlet, shared, servlet.c)	43	PHP_SELECT_SAPI(servlet, shared, servlet.c)
43	PHP_ADD_SOURCES(/sapi/servlet, java.c,, sapi)	44	PHP_ADD_SOURCES(/sapi/servlet, java.c,, sapi)
44	PHP_ADD_MAKEFILE_FRAGMENT(sapi/servlet/Makefile.frag)	45	PHP_ADD_MAKEFILE_FRAGMENT(sapi/servlet/Makefile.frag, sapi/servlet, sapi/servlet)
45		46
46	AC_MSG_RESULT(yes)	47	AC_MSG_RESULT(yes)
47	else	48	else
48	-- TSRM/tsrm.m4	49	++ TSRM/tsrm.m4
Lines 68-74 Link Here
68	])	68	])
69		69
70	sinclude(threads.m4)	70	sinclude(threads.m4)
71	sinclude(TSRM/threads.m4)
72		71
73	AC_DEFUN([TSRM_CHECK_PTHREADS],[	72	AC_DEFUN([TSRM_CHECK_PTHREADS],[
74		73