summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoe <joe@61a7d7f5-40b7-0310-9c16-bb0ea8cb1845>2006-06-26 10:01:29 +0000
committerjoe <joe@61a7d7f5-40b7-0310-9c16-bb0ea8cb1845>2006-06-26 10:01:29 +0000
commitf685cdb92c9b0877ce7ceb546b506152da274364 (patch)
treec59fb6bbe3abbb9cc663dee1b074c1dd55ca5d70
parent34275ec40affe0b94967c615aad3a5811bc09516 (diff)
downloadneon-f685cdb92c9b0877ce7ceb546b506152da274364.tar.gz
* configure.in: Substitute NEON_PC_LIBS for neon.pc.
* neon.pc.in: Define Libs.Private; use only NEON_PC_LIBS in Libs. git-svn-id: http://svn.webdav.org/repos/projects/neon/trunk@1054 61a7d7f5-40b7-0310-9c16-bb0ea8cb1845
-rw-r--r--configure.in11
-rw-r--r--neon.pc.in3
2 files changed, 13 insertions, 1 deletions
diff --git a/configure.in b/configure.in
index 6e8ee12..5016f2e 100644
--- a/configure.in
+++ b/configure.in
@@ -133,6 +133,17 @@ fi
AC_SUBST(TEST_LDFLAGS)
+AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+if test "$PKG_CONFIG" != "no"; then
+ # pkg-config >= 0.18 will use "Libs.private" iff necessary,
+ # older versions which don't recognize that field may always
+ # need all libraries in Libs.
+ if $PKG_CONFIG --atleast-pkgconfig-version=0.18; then :; else
+ NEON_PC_LIBS=${NEON_LIBS}
+ fi
+fi
+AC_SUBST(NEON_PC_LIBS)
+
# Bundled language catalogs
ALL_LINGUAS="cs de fr ja nn ru tr zh"
AC_SUBST(ALL_LINGUAS)
diff --git a/neon.pc.in b/neon.pc.in
index 9d431de..f72bdeb 100644
--- a/neon.pc.in
+++ b/neon.pc.in
@@ -6,5 +6,6 @@ includedir=@includedir@
Name: neon
Description: HTTP/WebDAV client library
Version: @NEON_VERSION@
-Libs: -L${libdir} -lneon @NEON_LIBS@
+Libs.private: @NEON_LIBS@
+Libs: -L${libdir} -lneon @NEON_PC_LIBS@
Cflags: -I${includedir}/neon @NEON_CFLAGS@