diff options
| author | foobar <sniper@php.net> | 2001-06-03 21:32:53 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2001-06-03 21:32:53 +0000 |
| commit | 75720b018eaba3d41dd0710d558988b883d998ff (patch) | |
| tree | 8123ff967f96fdd79dbb9d1d340f7b30bd5b6bea | |
| parent | 7112f32e66df70eed4f54885dc11396fb28377d0 (diff) | |
| download | php-git-75720b018eaba3d41dd0710d558988b883d998ff.tar.gz | |
Fixed little buggie with T1lib support.
| -rw-r--r-- | ext/gd/config.m4 | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ext/gd/config.m4 b/ext/gd/config.m4 index 3fab5814e1..0094b9a5be 100644 --- a/ext/gd/config.m4 +++ b/ext/gd/config.m4 @@ -138,13 +138,13 @@ AC_DEFUN(PHP_GD_T1LIB,[ [ --with-t1lib[=DIR] GD: Include T1lib support.]) if test "$PHP_T1LIB" != "no"; then - for i in /usr/local /usr $PHP_T1LIB; do + for i in /usr /usr/local $PHP_T1LIB; do if test -f "$i/include/t1lib.h"; then T1_DIR=$i fi done - if test "$T1_DIR" != "no"; then + if test "$T1_DIR"; then AC_CHECK_LIB(t1, T1_GetExtend, [ AC_DEFINE(HAVE_LIBT1,1,[ ]) @@ -152,7 +152,11 @@ AC_DEFUN(PHP_GD_T1LIB,[ PHP_ADD_LIBRARY_WITH_PATH(t1, "$T1_DIR/lib", GD_SHARED_LIBADD) ],[ AC_MSG_ERROR(Problem with libt1.(a|so). Please check config.log for more information.) + ],[ + -L$T1_DIR/lib ]) + else + AC_MSG_ERROR(Your t1lib distribution is not installed correctly. Please reinstall it.) fi fi ]) @@ -217,7 +221,7 @@ dnl A whole whack of possible places where these might be done for i in lib/gd1.3 lib/gd lib gd1.3 gd ""; do - test -f $PHP_GD/$i/libgd.so -o -f $PHP_GD/$i/libgd.a && GD_LIB=$PHP_GD/$i + test -f $PHP_GD/$i/libgd.s? -o -f $PHP_GD/$i/libgd.a && GD_LIB=$PHP_GD/$i done if test -n "$GD_INCLUDE" && test -n "$GD_LIB" ; then |