Make it possible to build this extension as shared module.

foobar · foobar · commit d87e59a1a3de · 2001-06-22T15:52:25.000Z
diff --git a/ext/sybase_ct/Makefile.in b/ext/sybase_ct/Makefile.in
@@ -1,5 +1,8 @@
 
-LTLIBRARY_NAME    = libsybase_ct.la
-LTLIBRARY_SOURCES = php_sybase_ct.c
+LTLIBRARY_NAME           = libsybase_ct.la
+LTLIBRARY_SOURCES        = php_sybase_ct.c
+LTLIBRARY_SHARED_NAME    = sybase_ct.la
+LTLIBRARY_SHARED_LIBADD  = $(SYBASE_CT_SHARED_LIBADD)
 
 include $(top_srcdir)/build/dynlib.mk
+
diff --git a/ext/sybase_ct/config.m4 b/ext/sybase_ct/config.m4
@@ -1,44 +1,39 @@
 dnl $Id$
 
-AC_MSG_CHECKING(for Sybase-CT support)
-AC_ARG_WITH(sybase-ct,
+PHP_ARG_WITH(sybase-ct, for Sybase-CT support,
 [  --with-sybase-ct[=DIR]  Include Sybase-CT support.  DIR is the Sybase home
-                          directory, defaults to /home/sybase.],
-[
-  if test "$withval" != "no"; then
-    AC_MSG_RESULT(yes)
-    if test -z "$SYBASE_LIBS"; then
-      PHP_EXTENSION(sybase_ct)
-    fi
-    AC_DEFINE(HAVE_SYBASE_CT,1,[ ])
-    if test "$withval" = "yes"; then
-      SYBASE_CT_INCDIR=/home/sybase/include
-      SYBASE_CT_LIBDIR=/home/sybase/lib
-    else
-      SYBASE_CT_INCDIR=$withval/include
-      SYBASE_CT_LIBDIR=$withval/lib
-    fi
-	PHP_ADD_INCLUDE($SYBASE_CT_INCDIR)
-	PHP_ADD_LIBPATH($SYBASE_CT_LIBDIR)
-	PHP_ADD_LIBRARY(cs)
-	PHP_ADD_LIBRARY(ct)
-	PHP_ADD_LIBRARY(comn)
-	PHP_ADD_LIBRARY(intl)
-	SYBASE_CT_LIBS="-lcs -lct -lcomn -lintl"
-    old_LDFLAGS=$LDFLAGS
-    LDFLAGS="$LDFLAGS -L$SYBASE_CT_LIBDIR"
-    AC_CHECK_LIB(tcl, netg_errstr,
-              [ PHP_ADD_LIBRARY(tcl) ],
-              [ PHP_ADD_LIBRARY(sybtcl) ],
-              [ $SYBASE_CT_LIBS ])
-    AC_CHECK_LIB(insck, insck__getVdate,
-              [ PHP_ADD_LIBRARY(insck) ])
-    AC_CHECK_LIB(insck, bsd_tcp,
-              [ PHP_ADD_LIBRARY(insck) ])
-      LDFLAGS=$old_LDFLAGS
+                          directory. Defaults to /home/sybase.])
+
+if test "$PHP_SYBASE_CT" != "no"; then
+  AC_DEFINE(HAVE_SYBASE_CT,1,[ ])
+  PHP_EXTENSION(sybase_ct,$ext_shared)
+  PHP_SUBST(SYBASE_CT_SHARED_LIBADD)
+  
+  if test "$PHP_SYBASE_CT" = "yes"; then
+    SYBASE_CT_INCDIR=/home/sybase/include
+    SYBASE_CT_LIBDIR=/home/sybase/lib
   else
-    AC_MSG_RESULT(no)
+    SYBASE_CT_INCDIR=$PHP_SYBASE_CT/include
+    SYBASE_CT_LIBDIR=$PHP_SYBASE_CT/lib
   fi
-],[
-  AC_MSG_RESULT(no)
-])
+
+  PHP_ADD_INCLUDE($SYBASE_CT_INCDIR)
+  PHP_ADD_LIBPATH($SYBASE_CT_LIBDIR, SYBASE_CT_SHARED_LIBADD)
+  PHP_ADD_LIBRARY(cs,, SYBASE_CT_SHARED_LIBADD)
+  PHP_ADD_LIBRARY(ct,, SYBASE_CT_SHARED_LIBADD)
+  PHP_ADD_LIBRARY(comn,, SYBASE_CT_SHARED_LIBADD)
+  PHP_ADD_LIBRARY(intl,, SYBASE_CT_SHARED_LIBADD)
+
+  SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lcs -lct -lcomn -lintl"
+
+  AC_CHECK_LIB(tcl, netg_errstr, [
+    PHP_ADD_LIBRARY(tcl,,SYBASE_CT_SHARED_LIBADD)
+  ],[ 
+    PHP_ADD_LIBRARY(sybtcl,,SYBASE_CT_SHARED_LIBADD)
+  ],[ 
+    $SYBASE_CT_LIBS 
+  ])
+
+  AC_CHECK_LIB(insck, insck__getVdate, [PHP_ADD_LIBRARY(insck,, SYBASE_CT_SHARED_LIBADD)],[],[-L$SYBASE_CT_LIBDIR])
+  AC_CHECK_LIB(insck, bsd_tcp,         [PHP_ADD_LIBRARY(insck,, SYBASE_CT_SHARED_LIBADD)],[],[-L$SYBASE_CT_LIBDIR])
+fi
