projects / packages / php.git / blame
| Commit | Line | Data |
|---|---|---|
| a74f7ad0 AM |
1 | diff -urN php-5.1.0RC1.org/ext/ming/config.m4 php-5.1.0RC1/ext/ming/config.m4 |
| 2 | --- php-5.1.0RC1.org/ext/ming/config.m4 2005-07-18 01:58:39.000000000 +0200 | |
| 64c1d234 | 3 | +++ php-5.1.0RC1/ext/ming/config.m4 2005-08-25 23:03:43.002336568 +0200 |
| 1c6d1880 | 4 | @@ -9,7 +9,7 @@ |
| 5 | AC_CHECK_LIB(m, sin) | |
| 6 | ||
| 7 | for i in $PHP_MING /usr/local /usr; do | |
| 8 | - if test -f $i/lib/libming.$SHLIB_SUFFIX_NAME -o -f $i/lib/libming.a; then | |
| a74f7ad0 | 9 | + if test -f $i/$PHP_LIBDIR/libming.$SHLIB_SUFFIX_NAME -o -f $i/$PHP_LIBDIR/libming.a; then |
| 1c6d1880 | 10 | MING_DIR=$i |
| 11 | break | |
| 12 | fi | |
| 64c1d234 AM |
13 | @@ -34,11 +34,11 @@ |
| 14 | ],[ | |
| 15 | AC_MSG_ERROR([Ming library 0.2a or greater required.]) | |
| 16 | ],[ | |
| 17 | - -L$MING_DIR/lib | |
| 18 | + -L$MING_DIR/$PHP_LIBDIR | |
| 19 | ]) | |
| 20 | ||
| 21 | PHP_ADD_INCLUDE($MING_INC_DIR) | |
| 22 | - PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/lib, MING_SHARED_LIBADD) | |
| 23 | + PHP_ADD_LIBRARY_WITH_PATH(ming, $MING_DIR/$PHP_LIBDIR, MING_SHARED_LIBADD) | |
| 24 | ||
| 25 | AC_MSG_CHECKING([for destroySWFBlock]) | |
| 26 | AC_TRY_RUN([ | |
| 27 | ||
| 28 | ||
| 163fc75d AM |
29 | diff -urN php-5.1.0RC1.org/scripts/Makefile.frag php-5.1.0RC1/scripts/Makefile.frag |
| 30 | --- php-5.1.0RC1.org/scripts/Makefile.frag 2005-08-08 18:06:48.000000000 +0200 | |
| 31 | +++ php-5.1.0RC1/scripts/Makefile.frag 2005-08-25 20:21:39.533528512 +0200 | |
| 32 | @@ -4,7 +4,7 @@ | |
| 33 | # | |
| 34 | ||
| 35 | phpincludedir = $(includedir)/php | |
| 36 | -phpbuilddir = $(libdir)/build | |
| 37 | +phpbuilddir = $(libdir)/php/build | |
| 38 | ||
| 39 | BUILD_FILES = \ | |
| 40 | scripts/phpize.m4 \ | |
| 41 |