pgpool2.git / summary / log / commit / refs

commit    85434aae8a8bfea72eab8de9ba7ea3fa0c902bcc
Author:   Yoshiyuki Asaba <y-asaba at pgfoundry.org>
Date:     Wed Feb 28 10:44:06 2007 +0000

    Fix link error on Solaris. Solaris's ld does not have --rpath option.
    So it uses libtool's -rpath option instead of ld's option.


 Makefile.am | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index ba5a0d4c2..67af46fbb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,10 +19,11 @@ data_DATA = sql/system_db.sql
 
 AM_CPPFLAGS = -Wall -Wmissing-prototypes -Wmissing-declarations -D_GNU_SOURCE -I @PGSQL_INCLUDE_DIR@
 
+pgpool_LDADD = -L@PGSQL_LIB_DIR@ -lpq parser/libsql-parser.a pcp/libpcp.la parser/nodes.o
 if enable_rpath
-  pgpool_LDFLAGS = -lpq -L@PGSQL_LIB_DIR@ -Wl,-rpath,@PGSQL_LIB_DIR@
+  pgpool_LDFLAGS = -rpath @PGSQL_LIB_DIR@ -rpath $(libdir)
 else
-  pgpool_LDFLAGS = -lpq -L@PGSQL_LIB_DIR@
+  pgpool_LDFLAGS = 
 endif
 
 AM_YFLAGS = -d
@@ -38,4 +39,4 @@ EXTRA_DIST = pgpool.8.in sql/system_db.sql doc/pgpool-ja.html doc/pgpool-en.html
 		sample/dist_def_pgbench.sql
 
 SUBDIRS = parser pcp
-LDADD = parser/libsql-parser.a pcp/libpcp.la parser/nodes.o
+


[parent: bede783a9847]