Skip to content

Commit ecef0d2

Browse files
committed
Skip other bitness libraries for LUW
1 parent 1f7df43 commit ecef0d2

File tree

1 file changed

+19
-14
lines changed

1 file changed

+19
-14
lines changed

config.m4

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,25 @@ if test "$PHP_PDO_IBM" != "no"; then
1717
dnl XXX: Macros for this? Can these be merged?
1818

1919
dnl LUW ships its client libraries in lib64/32 (at least on amd64 linux)
20-
PHP_CHECK_LIBRARY(db2, SQLDriverConnect, [
21-
PHP_ADD_LIBPATH($i/lib64, PDO_IBM_SHARED_LIBADD)
22-
PHP_ADD_LIBRARY(db2, 1, PDO_IBM_SHARED_LIBADD)
23-
PHP_ADD_INCLUDE($i/include)
24-
break
25-
], [
26-
], "-L$i/lib64" )
27-
PHP_CHECK_LIBRARY(db2, SQLDriverConnect, [
28-
PHP_ADD_LIBPATH($i/lib32, PDO_IBM_SHARED_LIBADD)
29-
PHP_ADD_LIBRARY(db2, 1, PDO_IBM_SHARED_LIBADD)
30-
PHP_ADD_INCLUDE($i/include)
31-
break
32-
], [
33-
], "-L$i/lib32" )
20+
AC_CHECK_SIZEOF([long])
21+
AC_MSG_CHECKING([if we're on a 64-bit platform])
22+
AS_IF([test "$ac_cv_sizeof_long" -eq 4],[
23+
AC_MSG_RESULT([no])
24+
PHP_CHECK_LIBRARY(db2, SQLDriverConnect, [
25+
PHP_ADD_LIBPATH($i/lib32, PDO_IBM_SHARED_LIBADD)
26+
PHP_ADD_LIBRARY(db2, 1, PDO_IBM_SHARED_LIBADD)
27+
PHP_ADD_INCLUDE($i/include)
28+
break
29+
], [], "-L$i/lib32" )
30+
],[
31+
AC_MSG_RESULT([yes])
32+
PHP_CHECK_LIBRARY(db2, SQLDriverConnect, [
33+
PHP_ADD_LIBPATH($i/lib64, PDO_IBM_SHARED_LIBADD)
34+
PHP_ADD_LIBRARY(db2, 1, PDO_IBM_SHARED_LIBADD)
35+
PHP_ADD_INCLUDE($i/include)
36+
break
37+
], [], "-L$i/lib64" )
38+
])
3439
dnl The standalone clidriver package uses lib/
3540
PHP_CHECK_LIBRARY(db2, SQLDriverConnect, [
3641
PHP_ADD_LIBPATH($i/lib, PDO_IBM_SHARED_LIBADD)

0 commit comments

Comments
 (0)