Fix installation for silc-client and silc-toolkit packages

[silc.git] / lib / configure.ad

diff --git a/lib/configure.ad b/lib/configure.ad
index dc4ef610402ee9aa5222af2d1cc5a0e7d97582ea..cce0b95a1a41c1bbc52eced45ef5958fef4cc815 100644 (file)
--- a/lib/configure.ad
+++ b/lib/configure.ad
@@ -83,12 +83,12 @@ 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_CURRENT=4              # prev = 3
 LIBSILC_REVISION=0             # prev = 0
-LIBSILC_AGE=0                  # prev = 0
+LIBSILC_AGE=0                  # prev = 1
 
 # libsilcclient versions
-LIBSILCCLIENT_CURRENT=1                # prev = 0
+LIBSILCCLIENT_CURRENT=4                # prev = 3
 LIBSILCCLIENT_REVISION=0       # prev = 0
 LIBSILCCLIENT_AGE=0            # prev = 0
 
@@ -115,7 +115,7 @@ AC_C_BIGENDIAN
 # Check for epoll_wait and verify that epoll_create works
 AC_CHECK_FUNC(epoll_wait,
   [
-    AC_RUN_IFELSE(
+    AC_RUN_IFELSE([AC_LANG_SOURCE(
       [
         #include <sys/epoll.h>
         int main()
@@ -126,17 +126,17 @@ AC_CHECK_FUNC(epoll_wait,
           close(ret);
           return 0;
         }
-      ],
+      ])],
       [
         AC_DEFINE([HAVE_EPOLL_WAIT], [1], [HAVE_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,11 +148,10 @@ 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
 #
 AC_MSG_CHECKING(whether to enable stack tracing)
@@ -163,6 +162,8 @@ AC_ARG_ENABLE(stack-trace,
     yes)
       AC_MSG_RESULT(yes)
       AC_DEFINE([SILC_STACKTRACE], [], [SILC_STACKTRACE])
+      CFLAGS="$CFLAGS -rdynamic"
+      PC_CFLAGS="$PC_CFLAGS -rdynamic"
       ;;
     *)
       AC_MSG_RESULT(no)
@@ -171,7 +172,6 @@ AC_ARG_ENABLE(stack-trace,
   ],
     AC_MSG_RESULT(no)
   )
-#endif SILC_DIST_TOOLKIT
 
 #ifdef SILC_DIST_INPLACE
 #