From: Pekka Riikonen Date: Tue, 26 Apr 2005 17:35:36 +0000 (+0000) Subject: updates. X-Git-Tag: silc.server.0.9.20~6 X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=commitdiff_plain;h=7f6a5c28d66801de71294bdb587ab14bbeb96bbd updates. --- diff --git a/apps/irssi/configure.ad b/apps/irssi/configure.ad new file mode 100644 index 00000000..56cd63c5 --- /dev/null +++ b/apps/irssi/configure.ad @@ -0,0 +1,60 @@ +#ifdef SILC_DIST_CLIENT +# +# apps/irssi/configure.ad +# +# Author: Pekka Riikonen +# +# Copyright (C) 2005 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 +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# + +# The actual configure script is apps/irssi/configure.in. This file is +# for getting irssi specific stuff to top configure script with Autodist +# without polluting the top configure.ad file with these stuff. + +# help directory +# +HELPDIR="$silc_prefix/help" +AC_ARG_WITH(helpdir, + [[ --with-helpdir=DIR directory for SILC Client help files [PREFIX/help]]], + [ + case "$withval" in + no|yes) + ;; + *) + HELPDIR="$withval" + ;; + esac + ]) +AC_SUBST(HELPDIR) +AC_DEFINE_UNQUOTED([SILC_HELPDIR], "$HELPDIR", [SILC_HELPDIR]) + +# Irssi perl support +# +AC_ARG_WITH(perl, + [[ --with-perl[=yes|no|module] Build with Perl support - also specifies + if it should be built into main silc binary + (static, default) or as a module]]) + +#ifdef SILC_DIST_TOOLKIT +if test x$without_irssi = xfalse; then +#endif SILC_DIST_TOOLKIT + AC_CONFIG_SUBDIRS(apps/irssi) + AC_CONFIG_FILES( +apps/irssi/Makefile.defines +apps/irssi/Makefile.defines_int +) + irssi="yes" +#ifdef SILC_DIST_TOOLKIT +fi +#endif SILC_DIST_TOOLKIT + +#endif SILC_DIST_CLIENT diff --git a/configure.ad b/configure.ad index 6543952c..a5e6f3b6 100644 --- a/configure.ad +++ b/configure.ad @@ -403,44 +403,6 @@ AC_SUBST(DOCDIR) AC_DEFINE_UNQUOTED([SILC_DOCDIR], "$DOCDIR", [SILC_DOCDIR]) #endif SILC_DIST_AUTODIST -#ifdef SILC_DIST_CLIENT -# help directory -# -HELPDIR="$silc_prefix/help" -AC_ARG_WITH(helpdir, - [[ --with-helpdir=DIR directory for SILC help files [PREFIX/help]]], - [ - case "$withval" in - no|yes) - ;; - *) - HELPDIR="$withval" - ;; - esac - ]) -AC_SUBST(HELPDIR) -AC_DEFINE_UNQUOTED([SILC_HELPDIR], "$HELPDIR", [SILC_HELPDIR]) -#endif SILC_DIST_CLIENT - -#ifdef SILC_DIST_SIM -# SIM modules directory -# -MODULESDIR="$silc_prefix/modules" -AC_ARG_WITH(simdir, - [[ --with-simdir=DIR directory for SIM modules [PREFIX/modules]]], - [ - case "$withval" in - no|yes) - ;; - *) - MODULESDIR="$withval" - ;; - esac - ]) -AC_SUBST(MODULESDIR) -AC_DEFINE_UNQUOTED([SILC_MODULESDIR], "$MODULESDIR", [SILC_MODULESDIR]) -#endif SILC_DIST_SIM - #ifdef SILC_DIST_COMPILER ## ## With/without checkings @@ -613,7 +575,7 @@ fi #ifdef SILC_DIST_MATH # MP library checking. First check whether user wants to use GMP and use -# it if found. If not or not defined then compile the MPI library in the +# it if found. If not or not defined then compile the default library in the # source tree. # mp_gmp=false @@ -622,7 +584,7 @@ SAVE_CFLAGS="$CFLAGS" SAVE_LDFLAGS="$LDFLAGS" AC_MSG_CHECKING(whether to search for GMP) AC_ARG_WITH(gmp, - [[ --with-gmp[=DIR] use GMP instead of MPI [search in DIR/lib and DIR/include]]], + [[ --with-gmp[=DIR] use GMP instead of SILC Math [search in DIR/lib and DIR/include]]], [ case "$withval" in no) @@ -1030,15 +992,6 @@ AC_ARG_WITH(silcd, ]) #endif SILC_DIST_TOOLKIT -#ifdef SILC_DIST_CLIENT -# Irssi perl support -# -AC_ARG_WITH(perl, - [[ --with-perl[=yes|no|module] Build with Perl support - also specifies - if it should be built into main silc binary - (static, default) or as a module]]) -#endif SILC_DIST_CLIENT - libtoolfix=true AC_MSG_CHECKING(whether to do libtoolfix) AC_ARG_WITH(libtoolfix, @@ -1053,7 +1006,6 @@ AC_ARG_WITH(libtoolfix, AC_SUBST(ETCDIR) AC_DEFINE_UNQUOTED([SILC_ETCDIR], "$ETCDIR", [SILC_ETCDIR]) - #endif SILC_DIST_COMPILER ## @@ -1063,20 +1015,6 @@ AC_DEFINE_UNQUOTED([SILC_ETCDIR], "$ETCDIR", [SILC_ETCDIR]) # Make enable-shared aware AM_CONDITIONAL(SILC_ENABLE_SHARED, test "$enable_shared" = yes) -# Other configure scripts -# - -#ifdef SILC_DIST_TOOLKIT -if test x$without_irssi = xfalse; then -#endif SILC_DIST_TOOLKIT -#ifdef SILC_DIST_CLIENT - AC_CONFIG_SUBDIRS(apps/irssi) - irssi="yes" -#endif SILC_DIST_CLIENT -#ifdef SILC_DIST_TOOLKIT -fi -#endif SILC_DIST_TOOLKIT - SILC_TOP_SRCDIR=`pwd` # Included configure scripts @@ -1128,19 +1066,6 @@ apps/Makefile #endif SILC_DIST_APPS ) -#ifdef SILC_DIST_TOOLKIT -if test x$without_irssi = xfalse ; then -#endif SILC_DIST_TOOLKIT -#ifdef SILC_DIST_CLIENT - AC_CONFIG_FILES( -apps/irssi/Makefile.defines -apps/irssi/Makefile.defines_int -) -#endif SILC_DIST_CLIENT -#ifdef SILC_DIST_TOOLKIT -fi -#endif SILC_DIST_TOOLKIT - #ifdef SILC_DIST_TOOLKIT AC_CONFIG_FILES( win32/Makefile diff --git a/lib/configure.ad b/lib/configure.ad index eedd214c..a0383356 100644 --- a/lib/configure.ad +++ b/lib/configure.ad @@ -83,6 +83,25 @@ AC_SUBST(LIBSILCCLIENT_CURRENT) AC_SUBST(LIBSILCCLIENT_REVISION) AC_SUBST(LIBSILCCLIENT_AGE) +#ifdef SILC_DIST_SIM +# SIM modules directory +# +MODULESDIR="$silc_prefix/modules" +AC_ARG_WITH(simdir, + [[ --with-simdir=DIR directory for SIM modules [PREFIX/modules]]], + [ + case "$withval" in + no|yes) + ;; + *) + MODULESDIR="$withval" + ;; + esac + ]) +AC_SUBST(MODULESDIR) +AC_DEFINE_UNQUOTED([SILC_MODULESDIR], "$MODULESDIR", [SILC_MODULESDIR]) +#endif SILC_DIST_SIM + #ifdef SILC_DIST_TOOLKIT # Stack trace checking #