]>
Commit | Line | Data |
---|---|---|
0c4981f1 AF |
1 | --- php4-4.0.4final.orig/ext/gd/config.m4 |
2 | +++ php4-4.0.4final/ext/gd/config.m4 | |
3 | @@ -16,7 +16,6 @@ | |
4 | else | |
5 | AC_ADD_LIBRARY_WITH_PATH(jpeg, $withval/lib) | |
6 | fi | |
7 | - LIBS="$LIBS -L$withval/lib -ljpeg" | |
8 | ],[ | |
9 | AC_MSG_RESULT(no) | |
10 | AC_MSG_WARN(If configure fails try --with-jpeg-dir=<DIR>) | |
11 | @@ -36,9 +35,13 @@ | |
12 | LIBS="$LIBS -L$withval/lib -lX11" | |
13 | AC_CHECK_LIB(Xpm,XpmFreeXpmImage, [LIBS="$LIBS -L$withval/lib -lXpm"],[AC_MSG_RESULT(no)],) | |
14 | LIBS=$old_LIBS | |
15 | - AC_ADD_LIBRARY_WITH_PATH(Xpm, $withval/lib) | |
16 | - AC_ADD_LIBRARY_WITH_PATH(X11, $withval/lib) | |
17 | - LIBS="$LIBS -L$withval/lib -lXpm -L$withval/lib -lX11" | |
18 | + if test "$shared" = "yes"; then | |
19 | + GD_LIBS="$GD_LIBS -lXpm -lX11" | |
20 | + GD_LFLAGS="$GD_LFLAGS -L$withval/lib" | |
21 | + else | |
22 | + AC_ADD_LIBRARY_WITH_PATH(Xpm, $withval/lib) | |
23 | + AC_ADD_LIBRARY_WITH_PATH(X11, $withval/lib) | |
24 | + fi | |
25 | ],[ | |
26 | AC_MSG_RESULT(no) | |
27 | AC_MSG_WARN(If configure fails try --with-xpm-dir=<DIR>) | |
28 | @@ -112,10 +115,11 @@ | |
29 | LIBS=$old_LIBS | |
30 | LDFLAGS=$old_LDFLAGS | |
31 | if test "$ac_cv_lib_gd_gdImageCreateFromPng" = "yes"; then | |
32 | - AC_ADD_LIBRARY(png) | |
33 | - AC_ADD_LIBRARY(z) | |
34 | if test "$shared" = "yes"; then | |
35 | GD_LIBS="$GD_LIBS -lpng -lz" | |
36 | + else | |
37 | + AC_ADD_LIBRARY(png) | |
38 | + AC_ADD_LIBRARY(z) | |
39 | fi | |
40 | fi | |
41 | ||
42 | @@ -165,10 +169,11 @@ | |
43 | LIBS=$old_LIBS | |
44 | LDFLAGS=$old_LDFLAGS | |
45 | if test "$ac_cv_lib_gd_gdImageCreateFromPng" = "yes"; then | |
46 | - AC_ADD_LIBRARY(z) | |
47 | - AC_ADD_LIBRARY(png) | |
48 | if test "$shared" = "yes"; then | |
49 | GD_LIBS="$GD_LIBS -lpng -lz" | |
50 | + else | |
51 | + AC_ADD_LIBRARY(z) | |
52 | + AC_ADD_LIBRARY(png) | |
53 | fi | |
54 | fi | |
55 | ||
56 | @@ -249,7 +254,7 @@ | |
57 | else | |
58 | AC_ADD_LIBRARY_WITH_PATH(t1, "$T1_DIR/lib") | |
59 | fi | |
60 | - LIBS="$LIBS -L$T1_DIR/lib -lt1" | |
61 | +# LIBS="$LIBS -L$T1_DIR/lib -lt1" | |
62 | fi | |
63 | ||
64 | AC_MSG_RESULT(yes) | |
65 |