summaryrefslogtreecommitdiff
path: root/ext/pgsql
diff options
context:
space:
mode:
authorSascha Schumann <sas@php.net>1999-10-04 15:18:26 +0000
committerSascha Schumann <sas@php.net>1999-10-04 15:18:26 +0000
commit232afa4816c60a20d3db48c304ac59312d46ec46 (patch)
treedd8df9145c12f6b14fe751f6cc862aa8c0768e06 /ext/pgsql
parentec01d01400c67fd6d1bf2ae0e170771260e1ecc0 (diff)
downloadphp-git-232afa4816c60a20d3db48c304ac59312d46ec46.tar.gz
* archive-based convenience libraries completely replaced
with libtool components * SAPI targets can enable thread-safe mode and define shared/static/program build target * all configure scripts use the same config.cache * phplibdir is $(top_builddir)/modules to avoid permission problems * sapi/*/Makefile.inc are gone * runpath handling cleaned up * top-level Makefile.in obsoleted through Makefile.am * --enable-versioning uses libtool's cleaner and more portable -export-symbols feature
Diffstat (limited to 'ext/pgsql')
-rw-r--r--ext/pgsql/Makefile.am9
-rw-r--r--ext/pgsql/config.m42
2 files changed, 4 insertions, 7 deletions
diff --git a/ext/pgsql/Makefile.am b/ext/pgsql/Makefile.am
index 5a4a3e8605..1fe55e8517 100644
--- a/ext/pgsql/Makefile.am
+++ b/ext/pgsql/Makefile.am
@@ -1,14 +1,11 @@
# $Id$
-phplibdir=$(libdir)/php
-
SRC=pgsql.c
INCLUDES=@INCLUDES@ @PGSQL_INCLUDE@ -I@top_srcdir@ -I@top_srcdir@/libzend
-noinst_LIBRARIES=@PGSQL_STATIC@
-EXTRA_LIBRARIES=libphpext_pgsql.a
-libphpext_pgsql_a_SOURCES=$(SRC)
+noinst_LTLIBRARIES=@PGSQL_STATIC@
+EXTRA_LTLIBRARIES=libphpext_pgsql.la pgsql.la
+libphpext_pgsql_la_SOURCES=$(SRC)
phplib_LTLIBRARIES=@PGSQL_SHARED@
-EXTRA_LTLIBRARIES=pgsql.la
pgsql_la_SOURCES=$(SRC)
pgsql_la_LIBADD=@PGSQL_LFLAGS@ @PGSQL_LIBS@
pgsql_la_LDFLAGS=-avoid-version -module -rpath $(phplibdir)
diff --git a/ext/pgsql/config.m4 b/ext/pgsql/config.m4
index a64dc47824..d78136bc5c 100644
--- a/ext/pgsql/config.m4
+++ b/ext/pgsql/config.m4
@@ -47,7 +47,7 @@ AC_ARG_WITH(pgsql,
AC_MSG_RESULT(yes (static))
AC_ADD_LIBRARY_WITH_PATH(pq, $PGSQL_LIBDIR)
AC_ADD_INCLUDE($PGSQL_INCDIR)
- PGSQL_STATIC="libphpext_pgsql.a"
+ PGSQL_STATIC="libphpext_pgsql.la"
fi
AC_CHECK_FUNC(PQcmdTuples,AC_DEFINE(HAVE_PQCMDTUPLES))
CFLAGS=$old_CFLAGS; LDFLAGS=$old_LDFLAGS; LIBS=$old_LIBS