From f2f8d38efa3ccbaa05affaf8fcab24786ef452de Mon Sep 17 00:00:00 2001 From: Sascha Schumann Date: Thu, 30 Dec 1999 02:59:53 +0000 Subject: 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. --- ext/pgsql/Makefile.am | 13 ------------- ext/pgsql/Makefile.in | 14 ++++++++++++++ ext/pgsql/config.m4 | 8 +++----- 3 files changed, 17 insertions(+), 18 deletions(-) delete mode 100644 ext/pgsql/Makefile.am create mode 100644 ext/pgsql/Makefile.in (limited to 'ext/pgsql') diff --git a/ext/pgsql/Makefile.am b/ext/pgsql/Makefile.am deleted file mode 100644 index 6d6306cb27..0000000000 --- a/ext/pgsql/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -# $Id$ - -SRC=pgsql.c -INCLUDES=@INCLUDES@ @PGSQL_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/Zend -noinst_LTLIBRARIES=@PGSQL_STATIC@ -EXTRA_LTLIBRARIES=libphpext_pgsql.la pgsql.la -libphpext_pgsql_la_SOURCES=$(SRC) -phplib_LTLIBRARIES=@PGSQL_SHARED@ -pgsql_la_SOURCES=$(SRC) -pgsql_la_LIBADD=@PGSQL_LFLAGS@ @PGSQL_LIBS@ -pgsql_la_LDFLAGS=-avoid-version -module -rpath $(phplibdir) -EXTRA_LIBS= - diff --git a/ext/pgsql/Makefile.in b/ext/pgsql/Makefile.in new file mode 100644 index 0000000000..48527b2cda --- /dev/null +++ b/ext/pgsql/Makefile.in @@ -0,0 +1,14 @@ + +DEPTH = ../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libpgsql.la +LTLIBRARY_SOURCES = pgsql.c +LTLIBRARY_SHARED_NAME = pgsql.la +LTLIBRARY_SHARED_LIBADD = $(PGSQL_LFLAGS) $(PGSQL_LIBS) + +EXTRA_INCLUDES = $(PGSQL_INCLUDE) + +include $(topsrcdir)/build/ltlib.mk diff --git a/ext/pgsql/config.m4 b/ext/pgsql/config.m4 index 2cc65420c6..4e9aafbf35 100644 --- a/ext/pgsql/config.m4 +++ b/ext/pgsql/config.m4 @@ -56,8 +56,6 @@ AC_ARG_WITH(pgsql, ],[ AC_MSG_RESULT(no) ]) -AC_SUBST(PGSQL_LIBS) -AC_SUBST(PGSQL_LFLAGS) -AC_SUBST(PGSQL_INCLUDE) -AC_SUBST(PGSQL_STATIC) -AC_SUBST(PGSQL_SHARED) +PHP_SUBST(PGSQL_LIBS) +PHP_SUBST(PGSQL_LFLAGS) +PHP_SUBST(PGSQL_INCLUDE) -- cgit v1.2.1