projects
/
autodist.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.
[autodist.git]
/
configure.ad
diff --git
a/configure.ad
b/configure.ad
index b63cacbf1617b902ba29fd8cf19da6314ab96d94..0182a49af1304f2720cc67d2b01b31732463cb96 100644
(file)
--- a/
configure.ad
+++ b/
configure.ad
@@
-56,7
+56,9
@@
__SILC_HAVE_SIM=""
__SILC_ENABLE_DEBUG=""
AC_PROG_RANLIB
__SILC_ENABLE_DEBUG=""
AC_PROG_RANLIB
+#ifndef SILC_DIST_TOOLKIT
AC_DISABLE_SHARED
AC_DISABLE_SHARED
+#endif SILC_DIST_TOOLKIT
AC_PROG_LIBTOOL
# Header checking
AC_PROG_LIBTOOL
# Header checking
@@
-153,7
+155,7
@@
fi
#
AC_CHECK_HEADER(regex.h,
[
#
AC_CHECK_HEADER(regex.h,
[
- AC_DEFINE([HAVE_REGEX
], [], [HAVE_REGEX
])
+ AC_DEFINE([HAVE_REGEX
_H], [], [HAVE_REGEX_H
])
have_regex=1
], have_regex=0
)
have_regex=1
], have_regex=0
)
@@
-997,6
+999,7
@@
AC_ARG_WITH(irssi,
AC_MSG_RESULT(no)
without_irssi=true
])
AC_MSG_RESULT(no)
without_irssi=true
])
+AM_CONDITIONAL(with_irssi, test xwithout_irssi = xfalse)
# --with-silcd
#
# --with-silcd
#
@@
-1013,6
+1016,10
@@
AC_ARG_WITH(silcd,
without_silcd=true
])
#endif SILC_DIST_TOOLKIT
without_silcd=true
])
#endif SILC_DIST_TOOLKIT
+#ifdef SILC_DIST_INPLACE
+without_irssi=false
+without_silcd=false
+#endif SILC_DIST_INPLACE
libtoolfix=true
AC_MSG_CHECKING(whether to do libtoolfix)
libtoolfix=true
AC_MSG_CHECKING(whether to do libtoolfix)
@@
-1122,12
+1129,6
@@
echo " sbin directory ................: $s_sbindir"
echo " etc directory .................: $ETCDIR"
echo " man directory .................: $s_mandir"
echo " doc directory .................: $DOCDIR"
echo " etc directory .................: $ETCDIR"
echo " man directory .................: $s_mandir"
echo " doc directory .................: $DOCDIR"
-#ifdef SILC_DIST_CLIENT
-echo " help directory ................: $HELPDIR"
-#endif SILC_DIST_CLIENT
-#ifdef SILC_DIST_SERVER
-echo " logs directory ................: $LOGSDIR"
-#endif SILC_DIST_SERVER
#ifdef SILC_DIST_SIM
echo " SIM directory .................: $MODULESDIR"
#endif SILC_DIST_SIM
#ifdef SILC_DIST_SIM
echo " SIM directory .................: $MODULESDIR"
#endif SILC_DIST_SIM
@@
-1151,10
+1152,6
@@
echo " Compile SILC Client ...........: $irssi"
#ifdef SILC_DIST_SERVER
echo " Compile SILC Server ...........: $silcd"
#ifdef SILC_DIST_SERVER
echo " Compile SILC Server ...........: $silcd"
-if test x$without_silcd = xfalse; then
-echo " Server configuration file .....: $summary_silcd_configfile"
-echo " Server PID file ...............: $PIDFILE"
-fi
#endif SILC_DIST_SERVER
#ifdef SILC_DIST_SIM
#endif SILC_DIST_SERVER
#ifdef SILC_DIST_SIM