X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fconfigure.ad;h=5f13377fbedd59f9d5562a91b62617bd6256efbd;hb=9905799a86c606304fd7df2cd401de1740a272a1;hp=a0383356484c67fb7ab8095dd555cf997cafa7e0;hpb=d1e71f42379e8b5cd0748a7aeae8561b02cfe53d;p=silc.git diff --git a/lib/configure.ad b/lib/configure.ad index a0383356..5f13377f 100644 --- a/lib/configure.ad +++ b/lib/configure.ad @@ -4,7 +4,7 @@ # # Author: Pekka Riikonen # -# Copyright (C) 2005 Pekka Riikonen +# Copyright (C) 2005, 2007 Pekka Riikonen # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -31,6 +31,7 @@ SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silccrypt" SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcmath" #endif SILC_DIST_MATH SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcutil" +SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcapputil" SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcske" #ifdef SILC_DIST_SFTP SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcsftp" @@ -38,9 +39,24 @@ 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 +#ifdef SILC_DIST_CLIENTLIB SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcclient" -#endif SILC_DIST_CLIENT +#endif SILC_DIST_CLIENTLIB +#ifdef SILC_DIST_ASN1 +SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcasn1" +#endif SILC_DIST_ASN1 +#ifdef SILC_DIST_SKR +SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcskr" +#endif SILC_DIST_SKR +#ifdef SILC_DIST_SERVERLIB +SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcserver" +#endif SILC_DIST_SERVERLIB +#ifdef SILC_DIST_HTTP +SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silchttp" +#endif SILC_DIST_HTTP +#ifdef SILC_DIST_VCARD +SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcvcard" +#endif SILC_DIST_VCARD ## ## Library versioning. @@ -53,8 +69,8 @@ SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcclient" # - If functions were added, increment [LIB]_AGE # - If functions were removed, set [LIB]_AGE to 0 # -# where [LIB] is LIBSILC and LIBSILCCLIENT, and where "functions" means -# functions public interfaces. +# where [LIB] is LIBSILC, LIBSILCCLIENT or LIBSILCSERVER, and where +# "functions" means functions public interfaces (API). # # The LIB_BASE_VERSION defines the SILC software major.minor version and # it is increment only when these version numbers actually change. @@ -62,17 +78,22 @@ SILC_LIB_INCLUDES="$SILC_LIB_INCLUDES -I$SILC_TOP_SRCDIR/lib/silcclient" # Base version for libraries. Do not change this unless SILC version # changes too. -LIB_BASE_VERSION=1.0 +LIB_BASE_VERSION=1.1 # libsilc versions -LIBSILC_CURRENT=5 # prev = 4 +LIBSILC_CURRENT=1 # prev = 0 LIBSILC_REVISION=0 # prev = 0 -LIBSILC_AGE=3 # prev = 3 +LIBSILC_AGE=0 # prev = 0 # libsilcclient versions -LIBSILCCLIENT_CURRENT=4 # prev = 4 +LIBSILCCLIENT_CURRENT=1 # prev = 0 LIBSILCCLIENT_REVISION=0 # prev = 0 -LIBSILCCLIENT_AGE=3 # prev = 3 +LIBSILCCLIENT_AGE=0 # prev = 0 + +# libsilcserver versions +LIBSILCSERVER_CURRENT=1 # prev = 0 +LIBSILCSERVER_REVISION=0 # prev = 0 +LIBSILCSERVER_AGE=0 # prev = 0 # Substitute the version numbers AC_SUBST(LIB_BASE_VERSION) @@ -82,6 +103,12 @@ AC_SUBST(LIBSILC_AGE) AC_SUBST(LIBSILCCLIENT_CURRENT) AC_SUBST(LIBSILCCLIENT_REVISION) AC_SUBST(LIBSILCCLIENT_AGE) +AC_SUBST(LIBSILCSERVER_CURRENT) +AC_SUBST(LIBSILCSERVER_REVISION) +AC_SUBST(LIBSILCSERVER_AGE) + +# Check for big-endian machines +AC_C_BIGENDIAN #ifdef SILC_DIST_SIM # SIM modules directory @@ -123,6 +150,49 @@ AC_ARG_ENABLE(stack-trace, ) #endif SILC_DIST_TOOLKIT +#ifdef SILC_DIST_INPLACE +# +# Profiling options (never delivered to distributions) +# +AC_MSG_CHECKING(whether to enable gprof) +AC_ARG_ENABLE(gprof, + [ --enable-gprof enable gprof profiling], + [ + case "${enableval}" in + yes) + AC_MSG_RESULT(yes) + SILC_ADD_CFLAGS(-pg) + LIBS="$LIBS -pg" + ;; + *) + AC_MSG_RESULT(no) + ;; + esac + ], + [ + AC_MSG_RESULT(no) + ]) + +AC_MSG_CHECKING(whether to enable gcov) +AC_ARG_ENABLE(gcov, + [ --enable-gcov enable gcov], + [ + case "${enableval}" in + yes) + AC_MSG_RESULT(yes) + SILC_ADD_CFLAGS(-fprofile-arcs) + LIBS="$LIBS -lgcov" + ;; + *) + AC_MSG_RESULT(no) + ;; + esac + ], + [ + AC_MSG_RESULT(no) + ]) +#endif SILC_DIST_INPLACE + # # Makefile outputs # @@ -130,7 +200,6 @@ AC_CONFIG_FILES( lib/Makefile lib/contrib/Makefile lib/silccore/Makefile -lib/silccrypt/Makefile #ifdef SILC_DIST_SIM lib/silcsim/Makefile #endif SILC_DIST_SIM @@ -140,13 +209,12 @@ lib/silcutil/unix/Makefile lib/silcutil/win32/Makefile lib/silcutil/beos/Makefile lib/silcutil/os2/Makefile -lib/silcutil/epoc/Makefile +lib/silcapputil/Makefile #ifdef SILC_DIST_SFTP lib/silcsftp/Makefile #endif SILC_DIST_SFTP #ifdef SILC_DIST_INPLACE lib/silcutil/tests/Makefile -lib/silccrypt/tests/Makefile lib/silccore/tests/Makefile lib/silcsftp/tests/Makefile #endif SILC_DIST_INPLACE @@ -156,13 +224,55 @@ lib/silcsftp/tests/Makefile AC_CONFIG_FILES( lib/silc.pc lib/silcclient.pc +lib/silcserver.pc ) #endif SILC_DIST_TOOLKIT #ifdef SILC_DIST_CLIENTLIB -AC_CONFIG_FILES(lib/silcclient/Makefile) +AC_CONFIG_FILES( +lib/silcclient/Makefile +lib/silcclient/tests/Makefile +) #endif SILC_DIST_CLIENTLIB +#ifdef SILC_DIST_SERVERLIB +AC_CONFIG_FILES( +lib/silcserver/Makefile +lib/silcserver/tests/Makefile +) +#endif SILC_DIST_SERVERLIB + +#ifdef SILC_DIST_ASN1 +AC_CONFIG_FILES( +lib/silcasn1/Makefile +#ifdef SILC_DIST_INPLACE +lib/silcasn1/tests/Makefile +#endif SILC_DIST_INPLACE +) +#endif SILC_DIST_ASN1 + +#ifdef SILC_DIST_SKR +AC_CONFIG_FILES( +lib/silcskr/Makefile +#ifdef SILC_DIST_INPLACE +lib/silcskr/tests/Makefile +#endif SILC_DIST_INPLACE +) +#endif SILC_DIST_SKR + +#ifdef SILC_DIST_HTTP +AC_CONFIG_FILES( +lib/silchttp/Makefile +lib/silchttp/tests/Makefile +) +#endif SILC_DIST_HTTP + +#ifdef SILC_DIST_VCARD +AC_CONFIG_FILES( +lib/silcvcard/Makefile +) +#endif SILC_DIST_VCARD + fi # compile_libs #endif SILC_DIST_LIB