Make sybase compilable as shared module

diff --git a/ext/sybase/Makefile.in b/ext/sybase/Makefile.in
index fd33146fe3596d7c08a2c1804b06a7233382c8d1..5c262e4eb10489f65af5ba2ec4fac80a18ea87ac 100644 (file)
--- a/ext/sybase/Makefile.in
+++ b/ext/sybase/Makefile.in
@@ -1,5 +1,7 @@
 
 LTLIBRARY_NAME    = libsybase.la
 LTLIBRARY_SOURCES = sybase.c
+LTLIBRARY_SHARED_NAME = sybase.la
+LTLIBRARY_SHARED_LIBADD = $(SYBASE_SHARED_LIBADD)
 
 include $(top_srcdir)/build/dynlib.mk

diff --git a/ext/sybase/config.m4 b/ext/sybase/config.m4
index 96d38c0471b103edccec897cfdb867e8b40dae09..784b546edd62f483547ffab192a949517e7ddc38 100644 (file)
--- a/ext/sybase/config.m4
+++ b/ext/sybase/config.m4
@@ -1,31 +1,24 @@
 dnl $Id$
 
-AC_MSG_CHECKING(for Sybase support)
-AC_ARG_WITH(sybase,
+PHP_ARG_WITH(sybase,for Sybase support,
 [  --with-sybase[=DIR]     Include Sybase-DB support.  DIR is the Sybase home
-                          directory, defaults to /home/sybase.],
-[
-  if test "$withval" != "no"; then
-    if test "$withval" = "yes"; then
-      SYBASE_INCDIR=/home/sybase/include
-      SYBASE_LIBDIR=/home/sybase/lib
-    else
-      SYBASE_INCDIR=$withval/include
-      SYBASE_LIBDIR=$withval/lib
-    fi
-       AC_ADD_INCLUDE($SYBASE_INCDIR)
-       AC_ADD_LIBPATH($SYBASE_LIBDIR)
-       AC_ADD_LIBRARY(sybdb)
-    AC_MSG_RESULT(yes)
-    PHP_EXTENSION(sybase)
-    AC_CHECK_LIB(dnet_stub, dnet_addr,
-     [ AC_ADD_LIBRARY(dnet_stub)
-        AC_DEFINE(HAVE_LIBDNET_STUB,1,[ ])
-     ])
-    AC_DEFINE(HAVE_SYBASE,1,[ ])
+                          directory, defaults to /home/sybase.])
+
+
+if test "$PHP_SYBASE" != "no"; then
+  if test "$PHP_SYBASE" = "yes"; then
+    SYBASE_INCDIR=/home/sybase/include
+    SYBASE_LIBDIR=/home/sybase/lib
   else
-    AC_MSG_RESULT(no)
+    SYBASE_INCDIR=$PHP_SYBASE/include
+    SYBASE_LIBDIR=$PHP_SYBASE/lib
   fi
-],[
-  AC_MSG_RESULT(no)
-])
+  AC_ADD_INCLUDE($SYBASE_INCDIR)
+  AC_ADD_LIBRARY_WITH_PATH(sybdb, $SYBASE_LIBDIR, SYBASE_SHARED_LIBADD)
+  PHP_EXTENSION(sybase, $ext_shared)
+  AC_CHECK_LIB(dnet_stub, dnet_addr,
+     [ AC_ADD_LIBRARY_WITH_PATH(dnet_stub,,SYBASE_SHARED_LIBADD)
+        AC_DEFINE(HAVE_LIBDNET_STUB,1,[ ])
+     ])
+  AC_DEFINE(HAVE_SYBASE,1,[ ])
+fi