Added pkg-config .pc file creation for libraries.

diff --git a/CHANGES b/CHANGES
index 864cbe68e4690635adb9f174d18f1b167a5c69a7..e9de1f11d0a97d00e21ffe1749186a2d25bd888c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+Wed Apr  6 09:10:31 CEST 2005  Pekka Riikonen <priikone@silcnet.org>
+
+       * Added pkg-config .pc file creation for silc core library
+         and silcclient library.  A patch by c0ffee.
+
 Mon Apr  4 15:15:46 EEST 2005  Pekka Riikonen <priikone@silcnet.org>
 
        * Simplified the invite and ban string handling in the

diff --git a/configure.in.pre b/configure.in.pre
index 140897d6c5c277ddbdf793313989ef6f708937c4..ae0645bdabc1f1844c4eb042488b06c3bef939c4 100644 (file)
--- a/configure.in.pre
+++ b/configure.in.pre
@@ -484,6 +484,9 @@ AC_SUBST(PIDFILE)
 #
 # SILC library checking
 compile_libs=true
+
+if test "x$silc_dist" != "xsilc-toolkit"; then
+
 AC_ARG_WITH(silc-includes, 
   [  --with-silc-includes=DIR SILC Toolkit includes [search in DIR]],
   [ac_silc_includes="$withval"], [ac_silc_includes="no"])
@@ -507,6 +510,8 @@ if test "$ac_silc_libs" != "no"; then
   LIBS="$LIBS -L$ac_silc_libs"
 fi
 
+fi # silc_dist != silc-toolkit
+
 
 # SOCKS4 support checking
 #

diff --git a/lib/Makefile.am.pre b/lib/Makefile.am.pre
index fc4c150571f6aabed45d78ed14466cf66a0f1a69..ac599c672047b42ab090f2cc5d893397ac8ce793 100644 (file)
--- a/lib/Makefile.am.pre
+++ b/lib/Makefile.am.pre
@@ -120,7 +120,10 @@ libsilcclient.a:
        -release $(LIB_BASE_VERSION) -rpath $(DESTDIR)$(libdir) -o libsilcclient.la
 
 if SILC_DIST_TOOLKIT
-SILC_EXTRA_DIST = doc
+pkgconfigdir = $(prefix)/lib/pkgconfig
+pkgconfig_DATA = silc.pc silcclient.pc
+
+SILC_EXTRA_DIST = doc silc.pc.in silcclient.pc.in
 else
 if SILC_DIST_SERVER
 SILC_EXTRA_DIST = 

diff --git a/lib/configure.ad b/lib/configure.ad
index 965db365134d6113ed0e99b999896974e5dcc9c6..4e025ccad6330eef759f9c577cc1f3492e417e0e 100644 (file)
--- a/lib/configure.ad
+++ b/lib/configure.ad
@@ -127,6 +127,13 @@ lib/silcsftp/Makefile
 lib/silcsftp/tests/Makefile
 )
 
+if test "x$silc_dist" = "xsilc-toolkit"; then
+  AC_CONFIG_FILES(
+lib/silc.pc
+lib/silcclient.pc
+)
+fi
+
 if test "x$silc_dist" = "xsilc-client" ||
    test "x$silc_dist" = "xsilc-toolkit"; then
   AC_CONFIG_FILES(lib/silcclient/Makefile)

diff --git a/lib/silc.pc.in b/lib/silc.pc.in
new file mode 100644 (file)
index 0000000..0a1a2bc
--- /dev/null
+++ b/lib/silc.pc.in
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: @PACKAGE@
+Description: SILC Library
+Version: @VERSION@
+Conflicts: libsilc <= 0.9.12
+Libs: @LIBS@ -L${libdir} -lsilc
+Cflags: -I${includedir}
+

diff --git a/lib/silcclient.pc.in b/lib/silcclient.pc.in
new file mode 100644 (file)
index 0000000..cd5854f
--- /dev/null
+++ b/lib/silcclient.pc.in
@@ -0,0 +1,13 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: @PACKAGE@ (client library)
+Description: SILC Client Library
+Version: @VERSION@
+Conflicts: libsilc <= 0.9.12
+Requires: silc = @VERSION@
+Libs: @LIBS@ -L${libdir} -lsilcclient
+Cflags: -I${includedir}
+