summaryrefslogtreecommitdiff
path: root/ext/oci8
diff options
context:
space:
mode:
authorSascha Schumann <sas@php.net>1999-12-30 02:59:53 +0000
committerSascha Schumann <sas@php.net>1999-12-30 02:59:53 +0000
commitf2f8d38efa3ccbaa05affaf8fcab24786ef452de (patch)
treec546807d61a77a191f89056212a4c40c63f0e83b /ext/oci8
parent6bf3529919cf60389797a107cab16c826df3e68f (diff)
downloadphp-git-f2f8d38efa3ccbaa05affaf8fcab24786ef452de.tar.gz
Integration of -ng changes. Changes:
- added support for externally built modules, - improved support for in-tree shared modules, - fixed diversion bugs, - configure displays some informative messages, - faster static build (libtool isn't used anymore for compiling non-PIC objects), - dependencies comparable to automake's without requiring GNU make or GCC, - working make clean for non-GNU makes.
Diffstat (limited to 'ext/oci8')
-rw-r--r--ext/oci8/Makefile.am5
-rw-r--r--ext/oci8/Makefile.in10
-rw-r--r--ext/oci8/config.m44
3 files changed, 12 insertions, 7 deletions
diff --git a/ext/oci8/Makefile.am b/ext/oci8/Makefile.am
deleted file mode 100644
index be5e7e03c2..0000000000
--- a/ext/oci8/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-# $Id$
-
-noinst_LTLIBRARIES=libphpext_oci8.la
-libphpext_oci8_la_SOURCES=oci8.c
-
diff --git a/ext/oci8/Makefile.in b/ext/oci8/Makefile.in
new file mode 100644
index 0000000000..60f8c8ce09
--- /dev/null
+++ b/ext/oci8/Makefile.in
@@ -0,0 +1,10 @@
+
+DEPTH = ../..
+topsrcdir = @topsrcdir@
+srcdir = @srcdir@
+VPATH = @srcdir@
+
+LTLIBRARY_NAME = liboci8.la
+LTLIBRARY_SOURCES = oci8.c
+
+include $(topsrcdir)/build/ltlib.mk
diff --git a/ext/oci8/config.m4 b/ext/oci8/config.m4
index 1b37a6373f..eff3028f64 100644
--- a/ext/oci8/config.m4
+++ b/ext/oci8/config.m4
@@ -170,5 +170,5 @@ AC_ARG_WITH(oci8,
#EXTRA_LIBS="$EXTRA_LIBS $ORACLE_SHLIBS $ORACLE_STLIBS $ORACLE_LIBS $ORACLE_LFLAGS"
EXTRA_LIBS="$EXTRA_LIBS $ORACLE_LFLAGS $ORACLE_LIBS"
INCLUDES="$INCLUDES $ORACLE_INCLUDE"
-AC_SUBST(ORACLE_HOME)
-AC_SUBST(ORACLE_VERSION)
+PHP_SUBST(ORACLE_HOME)
+PHP_SUBST(ORACLE_VERSION)