Skip to content

Commit d3d2b47

Browse files
author
foobar
committed
- Fixed some build problems (/usr/lib leaked in to LDFLAGS/LIBS)
- Made this extension to be possible to be build as shared.
1 parent 4eb6392 commit d3d2b47

File tree

1 file changed

+50
-59
lines changed

1 file changed

+50
-59
lines changed

‎ext/cpdf/config.m4

Lines changed: 50 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,82 @@
11
dnl $Id$
22

3-
AC_DEFUN(CPDF_TEMP_SUBST,[
4-
old_LIBS=$LIBS
5-
$1
6-
LIBS=$old_LIBS
7-
])
8-
93
AC_DEFUN(CPDF_JPEG_TEST,[
10-
CPDF_TEMP_SUBST([
11-
AC_ARG_WITH(jpeg-dir,
12-
[ --with-jpeg-dir[=DIR] CPDF: Set the path to libjpeg install prefix.],[
13-
for i in $withval /usr/local /usr; do
14-
if test -f "$i/lib/libjpeg.$SHLIB_SUFFIX_NAME" -o -f "$i/lib/libjpeg.a"; then
15-
CPDF_JPEG_DIR=$i
16-
break;
17-
fi
18-
done
19-
if test -z "$CPDF_JPEG_DIR"; then
20-
AC_MSG_CHECKING([for libjpeg (needed by cpdflib 2.x)])
21-
AC_MSG_ERROR([libjpeg.(a|so) not found.])
4+
AC_ARG_WITH(jpeg-dir,
5+
[ --with-jpeg-dir[=DIR] CPDF: Set the path to libjpeg install prefix.],[
6+
for i in $withval /usr/local /usr; do
7+
if test -f "$i/lib/libjpeg.$SHLIB_SUFFIX_NAME" -o -f "$i/lib/libjpeg.a"; then
8+
CPDF_JPEG_DIR=$i
9+
break;
2210
fi
23-
LIBS="$LIBS -L$CPDF_JPEG_DIR/lib"
24-
],)
25-
AC_CHECK_LIB(jpeg,jpeg_read_header, ,[AC_MSG_ERROR(Problem with libjpeg.(a|so). Please check config.log for more information.)],)
11+
done
2612
if test -z "$CPDF_JPEG_DIR"; then
27-
PHP_ADD_LIBRARY(jpeg)
28-
else
29-
PHP_ADD_LIBRARY_WITH_PATH(jpeg, $CPDF_JPEG_DIR/lib)
13+
AC_MSG_CHECKING([for libjpeg (needed by cpdflib 2.x)])
14+
AC_MSG_ERROR([libjpeg.(a|so) not found.])
3015
fi
31-
])
16+
PHP_CHECK_LIBRARY(jpeg, jpeg_read_header, [
17+
PHP_ADD_LIBRARY_WITH_PATH(jpeg, $CPDF_JPEG_DIR/lib, CPDF_SHARED_LIBADD)
18+
] ,[
19+
AC_MSG_ERROR([CPDF: Problem with libjpeg.(a|so). Please check config.log for more information.])
20+
], [
21+
-L$CPDF_JPEG_DIR/lib
22+
])
23+
],)
3224
])
3325

3426
AC_DEFUN(CPDF_TIFF_TEST,[
35-
CPDF_TEMP_SUBST([
36-
AC_ARG_WITH(tiff-dir,
37-
[ --with-tiff-dir[=DIR] CPDF: Set the path to libtiff install prefix.],[
38-
for i in $withval /usr/local /usr; do
39-
if test -f "$i/lib/libtiff.$SHLIB_SUFFIX_NAME" -o -f "$i/lib/libtiff.a"; then
40-
CPDF_TIFF_DIR=$i
41-
break;
42-
fi
43-
done
44-
if test -z "$CPDF_TIFF_DIR"; then
45-
AC_MSG_CHECKING([for libtiff (needed by cpdflib 2.x)])
46-
AC_MSG_ERROR([libtiff.(a|so) not found.])
27+
AC_ARG_WITH(tiff-dir,
28+
[ --with-tiff-dir[=DIR] CPDF: Set the path to libtiff install prefix.],[
29+
for i in $withval /usr/local /usr; do
30+
if test -f "$i/lib/libtiff.$SHLIB_SUFFIX_NAME" -o -f "$i/lib/libtiff.a"; then
31+
CPDF_TIFF_DIR=$i
32+
break;
4733
fi
48-
LIBS="$LIBS -L$CPDF_TIFF_DIR/lib"
49-
],)
50-
AC_CHECK_LIB(tiff,TIFFOpen, ,[AC_MSG_ERROR(Problem with libtiff.(a|so). Please check config.log for more information.)],)
34+
done
5135
if test -z "$CPDF_TIFF_DIR"; then
52-
PHP_ADD_LIBRARY(tiff)
53-
else
54-
PHP_ADD_LIBRARY_WITH_PATH(tiff, $CPDF_TIFF_DIR/lib)
36+
AC_MSG_CHECKING([for libtiff (needed by cpdflib 2.x)])
37+
AC_MSG_ERROR([libtiff.(a|so) not found.])
5538
fi
56-
])
39+
PHP_CHECK_LIBRARY(tiff, TIFFOpen, [
40+
PHP_ADD_LIBRARY_WITH_PATH(tiff, $CPDF_TIFF_DIR/lib, CPDF_SHARED_LIBADD)
41+
] ,[
42+
AC_MSG_ERROR([CPDF: Problem with libtiff.(a|so). Please check config.log for more information.])
43+
], [
44+
-L$CPDF_TIFF_DIR/lib
45+
])
46+
],)
5747
])
5848

5949
AC_MSG_CHECKING(for cpdflib support)
6050
AC_ARG_WITH(cpdflib,
6151
[ --with-cpdflib[=DIR] Include cpdflib support (requires cpdflib >= 2).],
6252
[
63-
if test "$withval" = "no"; then
64-
AC_MSG_RESULT(no)
65-
else
66-
AC_MSG_RESULT(yes)
67-
PHP_NEW_EXTENSION(cpdf, cpdf.c)
53+
PHP_WITH_SHARED
54+
if test "$withval" != "no"; then
55+
PHP_NEW_EXTENSION(cpdf, cpdf.c, $ext_shared)
56+
PHP_SUBST(CPDF_SHARED_LIBADD)
57+
6858
CPDF_JPEG_TEST
6959
CPDF_TIFF_TEST
60+
7061
for i in $withval /usr /usr/local; do
7162
if test -f "$i/include/cpdflib.h"; then
7263
CPDFLIB_INCLUDE=$i/include
7364
AC_MSG_CHECKING(for cpdflib.h)
7465
AC_MSG_RESULT([in $i/include])
75-
CPDF_TEMP_SUBST([
76-
LIBS="$LIBS -L$i/lib"
77-
AC_CHECK_LIB(cpdf, cpdf_open, [AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib])],
78-
[AC_MSG_ERROR([Cpdflib module requires cpdflib >= 2.])])
79-
])
80-
if test "$i" != "/usr" -a "$i" != "/usr/local"; then
81-
PHP_ADD_LIBRARY_WITH_PATH(cpdf, $i/lib)
66+
67+
PHP_CHECK_LIBRARY(cpdf, cpdf_open, [
8268
PHP_ADD_INCLUDE($CPDFLIB_INCLUDE)
83-
else
84-
PHP_ADD_LIBRARY(cpdf)
85-
fi
69+
PHP_ADD_LIBRARY_WITH_PATH(cpdf, $i/lib, CPDF_SHARED_LIBADD)
70+
AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib])
71+
], [
72+
AC_MSG_ERROR([Cpdflib module requires cpdflib >= 2.])
73+
], [
74+
-L$i/lib $CPDF_SHARED_LIBADD
75+
])
8676
break
8777
fi
8878
done
79+
8980
if test -z "$CPDFLIB_INCLUDE"; then
9081
AC_MSG_CHECKING(for cpdflib.h)
9182
AC_MSG_ERROR([not found])

0 commit comments

Comments
 (0)