updates.

diff --git a/configure.ad b/configure.ad
index a5e6f3b6d9f7d1d47dc22cc26398f6c65e3e706d..84006552c1f9941e5e2850ac4b07dd01b7acca8e 100644 (file)
--- a/configure.ad
+++ b/configure.ad
@@ -447,13 +447,17 @@ if test -n "$with_silc_includes" || test -n "$with_silc_libs"; then
 else
   # pkg-config check
   PKG_CHECK_MODULES(SILC, silc, compile_libs=false, compile_libs=true)
+#ifdef SILC_DIST_CLIENTLIB
   PKG_CHECK_MODULES(SILCCLIENT, silcclient, compile_libs=false, compile_libs=true)
+#endif SILC_DIST_CLIENTLIB
 
   if test x$compile_libs = xfalse; then
     LIBS="$LIBS $SILC_LIBS"
     CFLAGS="$CFLAGS $SILC_CFLAGS"
+#ifdef SILC_DIST_CLIENTLIB
     LIBS="$LIBS $SILCCLIENT_LIBS"
     CFLAGS="$CFLAGS $SILCCLIENT_CFLAGS"
+#endif SILC_DIST_CLIENTLIB
   fi
 fi
 #endif SILC_DIST_TOOLKIT

diff --git a/includes/silcincludes.h.in b/includes/silcincludes.h.in
index 23e8f340e8b10e4f80bc1c0677226d9854466a15..97ed81c7d4d863b64334d765735fa7aa4ed1b039 100644 (file)
--- a/includes/silcincludes.h.in
+++ b/includes/silcincludes.h.in
@@ -185,7 +185,7 @@ extern "C" {
 #endif
 
 #ifndef HAVE_REGEX_H
-#include "regex.h"
+#include "regexpr.h"
 #else
 #include <regex.h>
 #endif