projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed fingerprint generation. RedHat bug 372021.
[silc.git]
/
lib
/
configure.ad
diff --git
a/lib/configure.ad
b/lib/configure.ad
index 6da5e7c572f3581f8d5d0f68443dd448b760bc9c..9ff9f49a75dfa90831a0085afc3ed1bfb8bdaf94 100644
(file)
--- a/
lib/configure.ad
+++ b/
lib/configure.ad
@@
-26,7
+26,9
@@
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 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"
+#ifdef SILC_DIST_CRYPTO
SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silccrypt"
SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silccrypt"
+#endif SILC_DIST_CRYPTO
#ifdef SILC_DIST_MATH
SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcmath"
#endif SILC_DIST_MATH
#ifdef SILC_DIST_MATH
SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcmath"
#endif SILC_DIST_MATH
@@
-81,13
+83,13
@@
SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcvcard"
LIB_BASE_VERSION=1.1
# libsilc versions
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 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
LIBSILCCLIENT_AGE=0 # prev = 0
# libsilcserver versions
@@
-131,10
+133,10
@@
AC_CHECK_FUNC(epoll_wait,
)
])
)
])
+MODULESDIR="$silc_prefix/lib/modules"
#ifdef SILC_DIST_SIM
# SIM modules directory
#
#ifdef SILC_DIST_SIM
# SIM modules directory
#
-MODULESDIR="$silc_prefix/modules"
AC_ARG_WITH(simdir,
[[ --with-simdir=DIR directory for SIM modules [PREFIX/modules]]],
[
AC_ARG_WITH(simdir,
[[ --with-simdir=DIR directory for SIM modules [PREFIX/modules]]],
[
@@
-146,9
+148,9
@@
AC_ARG_WITH(simdir,
;;
esac
])
;;
esac
])
-AC_SUBST(MODULESDIR)
AC_DEFINE_UNQUOTED([SILC_MODULESDIR], "$MODULESDIR", [SILC_MODULESDIR])
#endif SILC_DIST_SIM
AC_DEFINE_UNQUOTED([SILC_MODULESDIR], "$MODULESDIR", [SILC_MODULESDIR])
#endif SILC_DIST_SIM
+AC_SUBST(MODULESDIR)
#ifdef SILC_DIST_TOOLKIT
# Stack trace checking
#ifdef SILC_DIST_TOOLKIT
# Stack trace checking
@@
-226,8
+228,20
@@
lib/silcsim/Makefile
#endif SILC_DIST_SIM
lib/silcske/Makefile
lib/silcutil/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
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
lib/silcapputil/Makefile
#ifdef SILC_DIST_SFTP
lib/silcsftp/Makefile
@@
-282,7
+296,9
@@
lib/silcskr/tests/Makefile
#ifdef SILC_DIST_HTTP
AC_CONFIG_FILES(
lib/silchttp/Makefile
#ifdef SILC_DIST_HTTP
AC_CONFIG_FILES(
lib/silchttp/Makefile
+#ifdef SILC_DIST_INPLACE
lib/silchttp/tests/Makefile
lib/silchttp/tests/Makefile
+#endif SILC_DIST_INPLACE
)
#endif SILC_DIST_HTTP
)
#endif SILC_DIST_HTTP