updates.

diff --git a/CHANGES b/CHANGES
index 24cf42f71f430c29946b6eed93ce8fc12c9d9cef..a342c5f3db19e0cd276a77f1797b885083b08518 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,8 @@ Thu Apr 28 15:57:37 EEST 2005  Pekka Riikonen <priikone@silcnet.org>
        * Added lib/contrib/getopt.[ch] for platforms that don't
          have it (it is not GPL implementation).
 
+       * Fixed compilation when pkg-config is used.
+
 Wed Apr 27 11:49:41 EEST 2005  Pekka Riikonen <priikone@silcnet.org>
 
        * A comma in invite/ban string is invalid, check for it.

diff --git a/Makefile.ad b/Makefile.ad
index 439941c0d01ac1a94243ea139b1e1c296b407859..99046c174dbf459b5ac661d509ae56baba1f29e4 100644 (file)
--- a/Makefile.ad
+++ b/Makefile.ad
@@ -19,7 +19,7 @@ AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 
 SUBDIRS =              \
 #ifdef SILC_DIST_LIB
-       lib             \
+       @LIBSUBDIR@     \
 #endif SILC_DIST_LIB
 #ifdef SILC_DIST_APPS
        apps            \

diff --git a/configure.ad b/configure.ad
index 26f0dbace8dc0524532a4e20aa6d076c8dc5fe06..5de48896a9c628e146a33940f446d578a008f93e 100644 (file)
--- a/configure.ad
+++ b/configure.ad
@@ -418,6 +418,7 @@ AC_DEFINE_UNQUOTED([SILC_DOCDIR], "$DOCDIR", [SILC_DOCDIR])
 #
 # SILC library checking
 compile_libs=true
+LIBSUBDIR=lib
 
 #ifndef SILC_DIST_TOOLKIT
 AC_ARG_WITH(silc-includes,
@@ -433,9 +434,11 @@ if test -n "$with_silc_includes" || test -n "$with_silc_libs"; then
   if test "$ac_silc_includes" != "no"; then
     compile_libs=false
     SILC_LIB_INCLUDES="-I$ac_silc_includes"
+    LIBSUBDIR=
   fi
   if test "$ac_silc_libs" != "no"; then
     compile_libs=false
+    LIBSUBDIR=
     LIBS="$LIBS -L$ac_silc_libs"
   fi
 
@@ -459,6 +462,7 @@ else
 #endif SILC_DIST_CLIENTLIB
 
   if test x$compile_libs = xfalse; then
+    LIBSUBDIR=
     LIBS="$LIBS $SILC_LIBS"
     CFLAGS="$CFLAGS $SILC_CFLAGS"
 #ifdef SILC_DIST_CLIENTLIB
@@ -469,6 +473,8 @@ else
 fi
 #endif SILC_DIST_TOOLKIT
 
+AC_SUBST(LIBSUBDIR)
+
 # SOCKS4 support checking
 #
 SAVE_LIBS="$LIBS"