From: Pekka Riikonen Date: Thu, 28 Apr 2005 11:29:39 +0000 (+0000) Subject: updates. X-Git-Tag: autodist.1.3~38 X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=commitdiff_plain;h=78fe25ca1cadaba57a749e461750bce74a2cb0d8 updates. --- diff --git a/configure.ad b/configure.ad index a5e6f3b6..84006552 100644 --- 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 23e8f340..97ed81c7 100644 --- 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 #endif