Removed references to lib/silcutil/epoc, fixed a bug in configure.ad.

diff --git a/CHANGES b/CHANGES
index 2faa7f928665b3c12131d018632b208155d6a1fe..78079c1d9d4722ba2d2a5dc38cd3a924608597d2 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+Tue Mar  6 22:19:44 CET 2007  Patrik Weiskircher <pat@icore.at>
+
+       * Removed references to lib/silcutil/epoc, fixed a bug in
+          configure.ad.  Affected files lib/configure.ad,
+          lib/silcutil/Makefile.ad, configure.ad.
+
 Mon Mar  5 23:27:32 CET 2007  Jochen Eisinger <coffee@silcnet.org>
 
        * Update patch to makefile from trunk so parallel make will link

diff --git a/configure.ad b/configure.ad
index 3dafcc9ca1e706b5b1c5a9ca44cec33f6e13ccd1..113f9f84c7d9a9013262c75b0896e683a12f6491 100644 (file)
--- a/configure.ad
+++ b/configure.ad
@@ -1021,7 +1021,7 @@ AC_ARG_WITH(silcd,
 #endif SILC_DIST_TOOLKIT
 #ifdef SILC_DIST_CLIENT
 AM_CONDITIONAL(with_irssi, true)
-#endif
+#endif SILC_DIST_CLIENT
 #ifdef SILC_DIST_INPLACE
 without_irssi=false
 without_silcd=false

diff --git a/lib/configure.ad b/lib/configure.ad
index e65a3d3b409f74bdce715035c6bfa66d8add2372..58a72cda44f47243b4c65d1eed8fc3f62239c2fc 100644 (file)
--- a/lib/configure.ad
+++ b/lib/configure.ad
@@ -140,7 +140,6 @@ lib/silcutil/unix/Makefile
 lib/silcutil/win32/Makefile
 lib/silcutil/beos/Makefile
 lib/silcutil/os2/Makefile
-lib/silcutil/epoc/Makefile
 #ifdef SILC_DIST_SFTP
 lib/silcsftp/Makefile
 #endif SILC_DIST_SFTP

diff --git a/lib/silcutil/Makefile.ad b/lib/silcutil/Makefile.ad
index 115e0b261087916525bee9efd865974a4b71a5b9..6f9e446a5130b985a25421ccde29f06e077c7ea4 100644 (file)
--- a/lib/silcutil/Makefile.ad
+++ b/lib/silcutil/Makefile.ad
@@ -20,9 +20,6 @@ AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
 if SILC_WIN32
 SUBDIRS=win32
 else
-if SILC_EPOC
-SUBDIRS=epoc
-else
 if SILC_BEOS
 SUBDIRS=beos
 else
@@ -33,9 +30,8 @@ SUBDIRS=unix
 endif
 endif
 endif
-endif
 
-DIST_SUBDIRS=win32 epoc beos os2 unix
+DIST_SUBDIRS=win32 beos os2 unix
 
 #ifdef SILC_DIST_TOOLKIT
 SILC_DIST_SOURCE = stacktrace.c