- Fixed bug #20715 (odbc could not be compiled as shared extension)

diff --git a/ext/odbc/config.m4 b/ext/odbc/config.m4
index 0c1e154e3d3725db4a42474983f5e664a04a03d6..98934a59dc09ddbc4e1fa66b5f69fc1a6484c2a6 100644 (file)
--- a/ext/odbc/config.m4
+++ b/ext/odbc/config.m4
@@ -537,11 +537,12 @@ fi
 
 if test -n "$ODBC_TYPE"; then
   if test "$ODBC_TYPE" != "dbmaker"; then
-    if test "$shared" != "yes"; then
-      PHP_EVAL_LIBLINE([$ODBC_LFLAGS $ODBC_LIBS], ODBC_SHARED_LIBADD)
-    fi
+    ext_shared=$shared
+    PHP_EVAL_LIBLINE([$ODBC_LFLAGS $ODBC_LIBS], ODBC_SHARED_LIBADD)
   fi
+
   AC_DEFINE(HAVE_UODBC,1,[ ])
+  PHP_SUBST(ODBC_SHARED_LIBADD)
   PHP_SUBST(ODBC_INCDIR)
   PHP_SUBST(ODBC_LIBDIR)
   PHP_SUBST_OLD(ODBC_INCLUDE)
@@ -549,5 +550,5 @@ if test -n "$ODBC_TYPE"; then
   PHP_SUBST_OLD(ODBC_LFLAGS)
   PHP_SUBST_OLD(ODBC_TYPE)
 
-  PHP_NEW_EXTENSION(odbc, php_odbc.c, $shared,, $ODBC_INCLUDE)
+  PHP_NEW_EXTENSION(odbc, php_odbc.c, $ext_shared,, $ODBC_INCLUDE)
 fi