cvs: /php4/ext/sybase Makefile.in config.m4
| From: | Sascha Schumann | Date: | Tue, 02 May 2000 04:27:02 +0000 |
| Subject: | cvs: /php4/ext/sybase Makefile.in config.m4 | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-14320@lists.php.net to get a copy of this message | ||
sas Tue May 2 06:27:02 2000 EDT
Modified files:
/php4/ext/sybase Makefile.in config.m4
Log:
Make sybase compilable as shared module
Index: php4/ext/sybase/Makefile.in
diff -u php4/ext/sybase/Makefile.in:1.9 php4/ext/sybase/Makefile.in:1.10
--- php4/ext/sybase/Makefile.in:1.9 Tue May 2 00:38:33 2000
+++ php4/ext/sybase/Makefile.in Tue May 2 06:27:02 2000
@@ -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
Index: php4/ext/sybase/config.m4
diff -u php4/ext/sybase/config.m4:1.5 php4/ext/sybase/config.m4:1.6
--- php4/ext/sybase/config.m4:1.5 Thu Dec 30 05:52:13 1999
+++ php4/ext/sybase/config.m4 Tue May 2 06:27:02 2000
@@ -1,31 +1,24 @@
-dnl $Id: config.m4,v 1.5 1999/12/30 04:52:13 sas Exp $
+dnl $Id: config.m4,v 1.6 2000/05/02 04:27:02 sas Exp $
-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