From: Pekka Riikonen <priikone@silcnet.org>
Date: Thu, 28 Apr 2005 14:26:32 +0000 (+0000)
Subject: 	updates.
X-Git-Tag: autodist.1.3~35
X-Git-Url: http://git.silcnet.org/gitweb/?a=commitdiff_plain;h=98475eab3fa050b1f850bf5667c1962f20794d4f;p=silc.git

	updates.
---

diff --git a/CHANGES b/CHANGES
index 24cf42f7..a342c5f3 100644
--- 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 439941c0..99046c17 100644
--- 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 26f0dbac..5de48896 100644
--- 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"