projects
/
crypto.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged silc_1_0_branch to trunk.
[crypto.git]
/
apps
/
silcd
/
configure.ad
diff --git
a/apps/silcd/configure.ad
b/apps/silcd/configure.ad
index d758333b066f6fa7490212ea567f139e77a72f3b..c39b95d9976db2c63a3e408572e5d5f559891349 100644
(file)
--- a/
apps/silcd/configure.ad
+++ b/
apps/silcd/configure.ad
@@
-1,6
+1,6
@@
#ifdef SILC_DIST_SERVER
#
#ifdef SILC_DIST_SERVER
#
-# silcd/configure.ad
+#
apps/
silcd/configure.ad
#
# Author: Pekka Riikonen <priikone@silcnet.org>
#
#
# Author: Pekka Riikonen <priikone@silcnet.org>
#
@@
-16,6
+16,14
@@
# GNU General Public License for more details.
#
# GNU General Public License for more details.
#
+SILCD_SUBDIR=
+
+#ifdef SILC_DIST_TOOLKIT
+if test x$without_silcd = xfalse; then
+#endif SILC_DIST_TOOLKIT
+
+SILCD_SUBDIR=silcd
+
# Logs directory
#
LOGSDIR="$silc_prefix/logs"
# Logs directory
#
LOGSDIR="$silc_prefix/logs"
@@
-65,16
+73,15
@@
AC_ARG_WITH(silcd-pid-file,
])
AC_SUBST(PIDFILE)
])
AC_SUBST(PIDFILE)
-#ifdef SILC_DIST_TOOLKIT
-if test x$without_silcd = xfalse ; then
-#endif SILC_DIST_TOOLKIT
- AC_CONFIG_FILES(
-silcd/Makefile
+AC_CONFIG_FILES(
+apps/silcd/Makefile
doc/example_silcd.conf
)
doc/example_silcd.conf
)
+
+silcd="yes"
#ifdef SILC_DIST_TOOLKIT
#ifdef SILC_DIST_TOOLKIT
-fi
+fi
# without_silcd = false
#endif SILC_DIST_TOOLKIT
#endif SILC_DIST_TOOLKIT
-silcd="yes"
+AC_SUBST(SILCD_SUBDIR)
#endif SILC_DIST_SERVER
#endif SILC_DIST_SERVER