+#ifdef SILC_DIST_LIB
#
# lib/configure.ad
#
# GNU General Public License for more details.
#
-if test x$compile_libs = xfalse; then
-
-##
-## Not compiling included libs.
-##
-
-# Remove lib subdir from SUBDIRS
-SILC_DIST_SUBDIRS=`echo $SILC_DIST_SUBDIRS | $sedpath -e 's/lib//'`
-
-else # compile_libs = true
+if test x$compile_libs = xtrue; then
##
## Will compile included libs
AC_MSG_NOTICE([Configuring SILC libraries])
# SILC Library directories
+SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/contrib"
SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silccore"
SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silccrypt"
+#ifdef SILC_DIST_MATH
SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcmath"
+#ifdef SILC_DIST_MPI
SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcmath/mpi"
+#endif SILC_DIST_MPI
+#endif SILC_DIST_MATH
SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcske"
-SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcsim"
SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcutil"
SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcsftp"
+#ifdef SILC_DIST_SIM
+SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcsim"
+#endif SILC_DIST_SIM
+#ifdef SILC_DIST_CLIENT
SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcclient"
-SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/contrib"
+#endif SILC_DIST_CLIENT
##
## Library versioning.
LIB_BASE_VERSION=1.0
# libsilc versions
-LIBSILC_CURRENT=3
-LIBSILC_REVISION=0
-LIBSILC_AGE=2
+LIBSILC_CURRENT=4 # prev = 3
+LIBSILC_REVISION=0 # prev = 0
+LIBSILC_AGE=3 # prev = 2
# libsilcclient versions
-LIBSILCCLIENT_CURRENT=3
-LIBSILCCLIENT_REVISION=0
-LIBSILCCLIENT_AGE=2
+LIBSILCCLIENT_CURRENT=4 # prev = 3
+LIBSILCCLIENT_REVISION=0 # prev = 0
+LIBSILCCLIENT_AGE=3 # prev = 2
# Substitute the version numbers
AC_SUBST(LIB_BASE_VERSION)
AC_SUBST(LIBSILCCLIENT_REVISION)
AC_SUBST(LIBSILCCLIENT_AGE)
+#ifdef SILC_DIST_TOOLKIT
# Stack trace checking
#
AC_MSG_CHECKING(whether to enable stack tracing)
case "${enableval}" in
yes)
AC_MSG_RESULT(yes)
- AC_DEFINE(SILC_STACKTRACE)
+ AC_DEFINE([SILC_STACKTRACE], [], [SILC_STACKTRACE])
;;
*)
AC_MSG_RESULT(no)
],
AC_MSG_RESULT(no)
)
+#endif SILC_DIST_TOOLKIT
#
# Makefile outputs
lib/Makefile
lib/contrib/Makefile
lib/silccore/Makefile
-lib/silccore/tests/Makefile
lib/silccrypt/Makefile
-lib/silccrypt/tests/Makefile
+#ifdef SILC_DIST_SIM
lib/silcsim/Makefile
+#endif SILC_DIST_SIM
lib/silcske/Makefile
lib/silcutil/Makefile
lib/silcutil/unix/Makefile
lib/silcutil/beos/Makefile
lib/silcutil/os2/Makefile
lib/silcutil/epoc/Makefile
-lib/silcutil/tests/Makefile
+#ifdef SILC_DIST_MATH
lib/silcmath/Makefile
+#endif SILC_DIST_MATH
lib/silcsftp/Makefile
+#ifdef SILC_DIST_INPLACE
+lib/silcutil/tests/Makefile
+lib/silccrypt/tests/Makefile
+lib/silccore/tests/Makefile
lib/silcsftp/tests/Makefile
+#endif SILC_DIST_INPLACE
)
-if test "x$silc_dist" = "xsilc-toolkit"; then
- AC_CONFIG_FILES(
+#ifdef SILC_DIST_TOOLKIT
+AC_CONFIG_FILES(
lib/silc.pc
lib/silcclient.pc
)
-fi
+#endif SILC_DIST_TOOLKIT
-if test "x$silc_dist" = "xsilc-client" ||
- test "x$silc_dist" = "xsilc-toolkit"; then
- AC_CONFIG_FILES(lib/silcclient/Makefile)
-fi
+#ifdef SILC_DIST_CLIENTLIB
+AC_CONFIG_FILES(lib/silcclient/Makefile)
+#endif SILC_DIST_CLIENTLIB
fi # compile_libs
+#endif SILC_DIST_LIB