X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fconfigure.ad;h=9ff9f49a75dfa90831a0085afc3ed1bfb8bdaf94;hb=127c91c66005ddf9585458914e4caaf56758b490;hp=cce9aea878d8c25adad611ca66619f2b6efa3569;hpb=8fd8212bcd16f2b53fbedff2a9b9a4e8c15b9695;p=silc.git diff --git a/lib/configure.ad b/lib/configure.ad index cce9aea8..9ff9f49a 100644 --- a/lib/configure.ad +++ b/lib/configure.ad @@ -83,13 +83,13 @@ SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcvcard" LIB_BASE_VERSION=1.1 # libsilc versions -LIBSILC_CURRENT=1 # prev = 0 -LIBSILC_REVISION=0 # prev = 0 -LIBSILC_AGE=0 # prev = 0 +LIBSILC_CURRENT=3 # prev = 2 +LIBSILC_REVISION=0 # prev = 1 +LIBSILC_AGE=1 # prev = 1 # libsilcclient versions -LIBSILCCLIENT_CURRENT=1 # prev = 0 -LIBSILCCLIENT_REVISION=0 # prev = 0 +LIBSILCCLIENT_CURRENT=2 # prev = 1 +LIBSILCCLIENT_REVISION=1 # prev = 1 LIBSILCCLIENT_AGE=0 # prev = 0 # libsilcserver versions @@ -133,10 +133,10 @@ AC_CHECK_FUNC(epoll_wait, ) ]) +MODULESDIR="$silc_prefix/lib/modules" #ifdef SILC_DIST_SIM # SIM modules directory # -MODULESDIR="$silc_prefix/modules" AC_ARG_WITH(simdir, [[ --with-simdir=DIR directory for SIM modules [PREFIX/modules]]], [ @@ -148,9 +148,9 @@ AC_ARG_WITH(simdir, ;; esac ]) -AC_SUBST(MODULESDIR) AC_DEFINE_UNQUOTED([SILC_MODULESDIR], "$MODULESDIR", [SILC_MODULESDIR]) #endif SILC_DIST_SIM +AC_SUBST(MODULESDIR) #ifdef SILC_DIST_TOOLKIT # Stack trace checking @@ -228,9 +228,20 @@ lib/silcsim/Makefile #endif SILC_DIST_SIM lib/silcske/Makefile lib/silcutil/Makefile +#ifdef SILC_DIST_TOOLKIT lib/silcutil/unix/Makefile lib/silcutil/win32/Makefile lib/silcutil/symbian/Makefile +#else !SILC_DIST_TOOLKIT +#ifdef SILC_DIST_CLIENT +lib/silcutil/unix/Makefile +lib/silcutil/win32/Makefile +#else !SILC_DIST_CLIENT +#ifdef SILC_DIST_SERVER +lib/silcutil/unix/Makefile +#endif SILC_DIST_SERVER +#endif SILC_DIST_CLIENT +#endif SILC_DIST_TOOLKIT lib/silcapputil/Makefile #ifdef SILC_DIST_SFTP lib/silcsftp/Makefile @@ -285,7 +296,9 @@ lib/silcskr/tests/Makefile #ifdef SILC_DIST_HTTP AC_CONFIG_FILES( lib/silchttp/Makefile +#ifdef SILC_DIST_INPLACE lib/silchttp/tests/Makefile +#endif SILC_DIST_INPLACE ) #endif SILC_DIST_HTTP