]>
Commit | Line | Data |
---|---|---|
dd810a2a JB |
1 | --- php-4.3.0/acinclude.m4.orig Sun Nov 17 20:28:57 2002 |
2 | +++ php-4.3.0/acinclude.m4 Fri Jan 3 09:59:15 2003 | |
fb89d575 | 3 | @@ -783,13 +783,13 @@ |
dd810a2a JB |
4 | dnl |
5 | AC_DEFUN([PHP_BUILD_PROGRAM],[ | |
6 | OVERALL_TARGET=[]ifelse($1,,php,$1) | |
7 | - php_c_pre='$(CC)' | |
8 | + php_c_pre='$(LIBTOOL) --mode=compile $(CC)' | |
9 | php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)' | |
10 | - php_c_post=' && echo > $[@]' | |
11 | - php_cxx_pre='$(CXX)' | |
fb89d575 | 12 | + php_c_post='' |
dd810a2a JB |
13 | + php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)' |
14 | php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)' | |
15 | - php_cxx_post=' && echo > $[@]' | |
16 | - php_lo=o | |
fb89d575 | 17 | + php_cxx_post='' |
dd810a2a | 18 | + php_lo=lo |
fb89d575 AM |
19 | |
20 | case $with_pic in | |
21 | yes) pic_setting='-prefer-pic';; | |
22 | ||
972d6cff AM |
23 | --- php/scripts/phpize.in~ 2008-06-16 10:54:51.923509081 +0200 |
24 | +++ php/scripts/phpize.in 2008-06-16 10:55:50.376836101 +0200 | |
25 | @@ -7,7 +7,7 @@ | |
26 | includedir="`eval echo @includedir@`/php" | |
27 | builddir="`pwd`" | |
28 | ||
29 | -FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4" | |
30 | +FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4 lt~obsolete.m4 ltoptions.m4 ltsugar.m4 ltversion.m4" | |
31 | FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh" | |
32 | CLEAN_FILES="$FILES *.o *.lo *.la .deps .libs/ build/ include/ modules/ install-sh \ | |
33 | mkinstalldirs missing config.nice config.sub config.guess configure configure.in \ | |
34 | @@ -121,7 +121,7 @@ | |
35 | ||
36 | (cd "$phpdir" && cp $FILES_BUILD "$builddir"/build) | |
37 | (cd "$phpdir" && cp $FILES "$builddir") | |
38 | - (cd "$builddir" && cat acinclude.m4 ./build/libtool.m4 > aclocal.m4) | |
39 | + (cd "$builddir" && cat acinclude.m4 ./build/{libtool,lt~obsolete,ltoptions,ltsugar,ltversion}.m4 > aclocal.m4) | |
40 | } | |
41 | ||
42 | phpize_replace_prefix() |