From: Pekka Riikonen Date: Tue, 29 May 2001 17:43:18 +0000 (+0000) Subject: updates. X-Git-Tag: 1.2.beta1~2236 X-Git-Url: http://git.silcnet.org/gitweb/?a=commitdiff_plain;h=321a36d1953a26f3ecda8fa2cccaa64e9d138d35;p=crypto.git updates. --- diff --git a/Makefile.am.pre b/Makefile.am.pre index a13e2abf..faeab165 100644 --- a/Makefile.am.pre +++ b/Makefile.am.pre @@ -21,7 +21,7 @@ AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign SUBDIRS = lib irssi silc silcd doc includes DIST_SUBDIRS = SILC_DISTRIBUTION_SUBDIRS -include $(top_srcdir)/Makefile.defines +include $(top_srcdir)/Makefile.defines.in dist-bzip: distdir -chmod -R a+r $(distdir) diff --git a/Makefile.defines.pre b/Makefile.defines.pre index bac18450..61644d1a 100644 --- a/Makefile.defines.pre +++ b/Makefile.defines.pre @@ -3,7 +3,7 @@ # # Author: Pekka Riikonen # -# Copyright (C) 2000 - 2001 Pekka Riikonen +# Copyright (C) 2001 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 @@ -19,20 +19,22 @@ # # This file is intended to include all common compilation defines for the # SILC source tree. All Makefile.ams in the SILC source tree are expected -# to include this file (Makefile.defines). Also this file may be included +# to include this file (Makefile.defines.in). Also this file may be included # in any external project that is included in the SILC source tree. # # Add following to your Makefile.am: # -# include $(top_srcdir)/Makefile.defines +# include $(top_srcdir)/Makefile.defines.in # -# -# All packages in the SILC source tree that include the Makefile.defines +# All packages in the SILC source tree that include the Makefile.defines.in # must also include the following two lines in their configure.in file. # # INCLUDE_DEFINES_INT="include \$(top_srcdir)/Makefile.defines_int" # AC_SUBST(INCLUDE_DEFINES_INT) # +# (See the Makefile.defines_int.pre for all different definitions but DO NOT +# directly include that file!) +# @INCLUDE_DEFINES_INT@ diff --git a/Makefile.defines_int.pre b/Makefile.defines_int.pre index c7fb38f8..446ca8f9 100644 --- a/Makefile.defines_int.pre +++ b/Makefile.defines_int.pre @@ -25,6 +25,7 @@ # Generic definitions # silc_top_srcdir=@SILC_TOP_SRCDIR@ +silc_install_prefix=@prefix@ # # Common libraries that are linked against the created executable @@ -35,7 +36,7 @@ SILC_COMMON_LIBS= @LIBS@ -L$(silc_top_srcdir)/lib -lsilc # Installation defines # silc_etcdir=@ETCDIR@ -silc_modulesdir=$(prefix)/@MODULESDIR@ -silc_helpdir=$(prefix)/@HELPDIR@ -silc_docdir=$(prefix)/@DOCDIR@ -silc_logsdir=$(prefix)/@LOGSDIR@ +silc_modulesdir=$(silc_install_prefix)/@MODULESDIR@ +silc_helpdir=$(silc_install_prefix)/@HELPDIR@ +silc_docdir=$(silc_install_prefix)/@DOCDIR@ +silc_logsdir=$(silc_install_prefix)/@LOGSDIR@ diff --git a/apps/irssi/Makefile.am b/apps/irssi/Makefile.am index a8e1077d..a8a1eff4 100644 --- a/apps/irssi/Makefile.am +++ b/apps/irssi/Makefile.am @@ -8,7 +8,10 @@ default-theme.h: $(srcdir)/default.theme SUBDIRS = src docs -confdir = $(sysconfdir)/irssi +include $(top_srcdir)/Makefile.defines.in + +#confdir = $(sysconfdir)/irssi +confdir = $(silc_etcdir) conf_DATA = config default.theme noinst_HEADERS = irssi-version.h diff --git a/apps/irssi/docs/Makefile.am b/apps/irssi/docs/Makefile.am index 80499614..46dc1a1e 100644 --- a/apps/irssi/docs/Makefile.am +++ b/apps/irssi/docs/Makefile.am @@ -1,4 +1,7 @@ -docdir = $(prefix)/doc/irssi +include $(top_srcdir)/Makefile.defines.in + +#docdir = $(prefix)/doc/irssi +docdir = $(silc_docdir) doc_DATA = \ formats.txt \ diff --git a/apps/irssi/docs/help/Makefile.am.gen b/apps/irssi/docs/help/Makefile.am.gen index abf824b4..c836962b 100644 --- a/apps/irssi/docs/help/Makefile.am.gen +++ b/apps/irssi/docs/help/Makefile.am.gen @@ -1,6 +1,8 @@ # Makefile.am is autogenerated by autogen.sh from Makefile.am.gen -helpdir = $(datadir)/irssi/help +include $(top_srcdir)/Makefile.defines.in + +helpdir = $(silc_helpdir) help_DATA = \ @HELPFILES@ diff --git a/apps/irssi/src/core/Makefile.am b/apps/irssi/src/core/Makefile.am index 1dc2f5f9..1443bc91 100644 --- a/apps/irssi/src/core/Makefile.am +++ b/apps/irssi/src/core/Makefile.am @@ -1,9 +1,11 @@ noinst_LIBRARIES = libcore.a +include $(top_srcdir)/Makefile.defines.in + INCLUDES = \ $(GLIB_CFLAGS) \ - -DSYSCONFDIR=\""$(sysconfdir)"\" \ - -DMODULEDIR=\""$(libdir)/irssi/modules"\" \ + -DSYSCONFDIR=\""$(silc_etcdir)"\" \ + -DMODULEDIR=\""$(silc_modulesdir)"\" \ -I$(top_srcdir)/src \ -I$(top_srcdir)/src/core diff --git a/apps/irssi/src/fe-common/core/Makefile.am b/apps/irssi/src/fe-common/core/Makefile.am index 9913cfe8..798c271c 100644 --- a/apps/irssi/src/fe-common/core/Makefile.am +++ b/apps/irssi/src/fe-common/core/Makefile.am @@ -1,10 +1,12 @@ noinst_LIBRARIES = libfe_common_core.a +include $(top_srcdir)/Makefile.defines.in + INCLUDES = \ $(GLIB_CFLAGS) \ -I$(top_srcdir)/src -I$(top_srcdir)/src/core/ \ - -DHELPDIR=\""$(datadir)/irssi/help"\" \ - -DSYSCONFDIR=\""$(sysconfdir)"\" + -DHELPDIR=\""$(silc_helpdir)"\" \ + -DSYSCONFDIR=\""$(silc_etcdir)"\" libfe_common_core_a_SOURCES = \ autorun.c \ diff --git a/apps/irssi/src/fe-common/silc/Makefile.am b/apps/irssi/src/fe-common/silc/Makefile.am index 320be8ad..72abc05e 100644 --- a/apps/irssi/src/fe-common/silc/Makefile.am +++ b/apps/irssi/src/fe-common/silc/Makefile.am @@ -1,11 +1,10 @@ -INCLUDES = $(GLIB_CFLAGS) -I$(IRSSI_INCLUDE) -I$(IRSSI_INCLUDE)/src - -SILC_INCLUDE=../../../.. IRSSI_INCLUDE=../../.. -INCLUDES = \ +include $(top_srcdir)/Makefile.defines.in + +ADD_INCLUDES = \ $(GLIB_CFLAGS) \ - -DSYSCONFDIR=\""$(sysconfdir)"\" \ + -DSYSCONFDIR=\""$(silc_etcdir)"\" \ -I$(IRSSI_INCLUDE) -I$(IRSSI_INCLUDE)/src \ -I$(IRSSI_INCLUDE)/src/core \ -I$(IRSSI_INCLUDE)/src/fe-common/core \ diff --git a/apps/irssi/src/fe-text/Makefile.am b/apps/irssi/src/fe-text/Makefile.am index 2d6fe7c6..326eb618 100644 --- a/apps/irssi/src/fe-text/Makefile.am +++ b/apps/irssi/src/fe-text/Makefile.am @@ -1,6 +1,6 @@ bin_PROGRAMS = silc -include $(top_srcdir)/Makefile.defines +include $(top_srcdir)/Makefile.defines.in ADD_INCLUDES = \ $(GLIB_CFLAGS) \ @@ -14,13 +14,14 @@ ADD_INCLUDES = \ silc_DEPENDENCIES = @COMMON_LIBS@ +LIBS = $(SILC_COMMON_LIBS) silc_LDADD = \ @COMMON_LIBS@ \ @PERL_LINK_LIBS@ \ @PERL_FE_LINK_LIBS@ \ $(PROG_LIBS) \ $(CURSES_LIBS) \ - -L../../../lib -lsilcclient $(SILC_COMMON_LIBS) + -L../../../lib -lsilcclient silc_SOURCES = \ gui-entry.c \ diff --git a/apps/irssi/src/silc/core/Makefile.am b/apps/irssi/src/silc/core/Makefile.am index 259fb6ef..769899ee 100644 --- a/apps/irssi/src/silc/core/Makefile.am +++ b/apps/irssi/src/silc/core/Makefile.am @@ -1,10 +1,10 @@ -include $(top_srcdir)/Makefile.defines +include $(top_srcdir)/Makefile.defines.in IRSSI_INCLUDE=../../.. ADD_INCLUDES = \ $(GLIB_CFLAGS) -I$(IRSSI_INCLUDE) -I$(IRSSI_INCLUDE)/src \ - -DSYSCONFDIR=\""$(sysconfdir)"\" \ + -DSYSCONFDIR=\""$(silc_etcdir)"\" \ -I$(IRSSI_INCLUDE) \ -I$(IRSSI_INCLUDE)/src \ -I$(IRSSI_INCLUDE)/src/core \ diff --git a/apps/silc/Makefile.am b/apps/silc/Makefile.am index 47bcd80d..20217d08 100644 --- a/apps/silc/Makefile.am +++ b/apps/silc/Makefile.am @@ -35,4 +35,4 @@ LDADD = -L. -L.. -L../lib -lsilcclient EXTRA_DIST = *.h -include $(top_srcdir)/Makefile.defines +include $(top_srcdir)/Makefile.defines.in diff --git a/apps/silcd/Makefile.am b/apps/silcd/Makefile.am index c9b7e988..02589519 100644 --- a/apps/silcd/Makefile.am +++ b/apps/silcd/Makefile.am @@ -40,4 +40,4 @@ LDADD = EXTRA_DIST = *.h -include $(top_srcdir)/Makefile.defines +include $(top_srcdir)/Makefile.defines.in diff --git a/configure.in.pre b/configure.in.pre index 5b0524ce..0b1b5ece 100644 --- a/configure.in.pre +++ b/configure.in.pre @@ -151,9 +151,10 @@ AC_ARG_WITH(etcdir, no) ;; yes) + ETCDIR="$withval" ;; *) - ETCDIR="$withwal" + ETCDIR="$withval" ;; esac ], ) @@ -167,9 +168,10 @@ AC_ARG_WITH(helpdir, no) ;; yes) + HELPDIR="$withval" ;; *) - HELPDIR="$withwal" + HELPDIR="$withval" ;; esac ], ) @@ -183,9 +185,10 @@ AC_ARG_WITH(docdir, no) ;; yes) + DOCDIR="$withval" ;; *) - DOCDIR="$withwal" + DOCDIR="$withval" ;; esac ], ) @@ -199,9 +202,10 @@ AC_ARG_WITH(simdir, no) ;; yes) + MODULESDIR="$withval" ;; *) - MODULESDIR="$withwal" + MODULESDIR="$withval" ;; esac ], ) @@ -215,9 +219,10 @@ AC_ARG_WITH(logsdir, no) ;; yes) + LOGSDIR="$withval" ;; *) - LOGSDIR="$withwal" + LOGSDIR="$withval" ;; esac ], ) @@ -395,6 +400,8 @@ AC_CONFIG_SUBDIRS(lib/trq) SILC_TOP_SRCDIR=`pwd` AC_SUBST(SILC_TOP_SRCDIR) +#SILC_INSTALL_PREFIX=$ac_default_prefix +#AC_SUBST(SILC_INSTALL_PREFIX) AC_SUBST(LIBS) INCLUDE_DEFINES_INT="include \$(top_srcdir)/Makefile.defines_int" AC_SUBST(INCLUDE_DEFINES_INT) diff --git a/includes/version.h b/includes/version.h index f5c4ca21..5c065457 100644 --- a/includes/version.h +++ b/includes/version.h @@ -32,7 +32,7 @@ typedef unsigned char SilcVersion; /* SILC version string */ const char *silc_version = SILC_VERSION_STRING; const char *silc_version_string = SILC_PROTOCOL_VERSION_STRING; -const char *silc_name = "SILC"; +const char *silc_name = SILC_NAME; const char *silc_fullname = "Secure Internet Live Conferencing"; #endif diff --git a/lib/contrib/Makefile.am b/lib/contrib/Makefile.am index 64305b1b..e5fcf4c4 100644 --- a/lib/contrib/Makefile.am +++ b/lib/contrib/Makefile.am @@ -27,4 +27,4 @@ libcontrib_a_SOURCES = \ EXTRA_DIST = *.h -include $(top_srcdir)/Makefile.defines +include $(top_srcdir)/Makefile.defines.in diff --git a/lib/silcclient/Makefile.am b/lib/silcclient/Makefile.am index 208c92de..b51424c6 100644 --- a/lib/silcclient/Makefile.am +++ b/lib/silcclient/Makefile.am @@ -33,5 +33,4 @@ libsilcclient_a_SOURCES = \ EXTRA_DIST = *.h -include $(top_srcdir)/Makefile.defines - +include $(top_srcdir)/Makefile.defines.in \ No newline at end of file diff --git a/lib/silccore/Makefile.am b/lib/silccore/Makefile.am index 41ffc31b..8eed24f8 100644 --- a/lib/silccore/Makefile.am +++ b/lib/silccore/Makefile.am @@ -35,4 +35,4 @@ libsilccore_a_SOURCES = \ EXTRA_DIST = *.h -include $(top_srcdir)/Makefile.defines +include $(top_srcdir)/Makefile.defines.in diff --git a/lib/silccrypt/Makefile.am b/lib/silccrypt/Makefile.am index 8840a617..57b8ecbd 100644 --- a/lib/silccrypt/Makefile.am +++ b/lib/silccrypt/Makefile.am @@ -40,5 +40,4 @@ libsilccrypt_a_SOURCES = \ EXTRA_DIST = *.h -include $(top_srcdir)/Makefile.defines - +include $(top_srcdir)/Makefile.defines.in diff --git a/lib/silcmath/Makefile.am b/lib/silcmath/Makefile.am index 711bf79a..663a2ef8 100644 --- a/lib/silcmath/Makefile.am +++ b/lib/silcmath/Makefile.am @@ -33,5 +33,4 @@ libsilcmath_a_SOURCES = \ EXTRA_DIST = *.h -include $(top_srcdir)/Makefile.defines - +include $(top_srcdir)/Makefile.defines.in diff --git a/lib/silcsim/Makefile.am b/lib/silcsim/Makefile.am index 4921e624..9f5dc781 100644 --- a/lib/silcsim/Makefile.am +++ b/lib/silcsim/Makefile.am @@ -76,5 +76,4 @@ CLEANFILES = $(SIM_MODULES_DIR)/*.sim.so EXTRA_DIST = *.h -include $(top_srcdir)/Makefile.defines - +include $(top_srcdir)/Makefile.defines.in diff --git a/lib/silcske/Makefile.am b/lib/silcske/Makefile.am index b47e0be1..620f38dc 100644 --- a/lib/silcske/Makefile.am +++ b/lib/silcske/Makefile.am @@ -27,5 +27,4 @@ libsilcske_a_SOURCES = \ EXTRA_DIST = *.h -include $(top_srcdir)/Makefile.defines - +include $(top_srcdir)/Makefile.defines.in diff --git a/lib/silcutil/Makefile.am b/lib/silcutil/Makefile.am index f1040de5..79ac3e4f 100644 --- a/lib/silcutil/Makefile.am +++ b/lib/silcutil/Makefile.am @@ -33,5 +33,4 @@ libsilcutil_a_SOURCES = \ EXTRA_DIST = *.h -include $(top_srcdir)/Makefile.defines - +include $(top_srcdir)/Makefile.defines.in diff --git a/prepare b/prepare index 6a0fe389..7073b1fb 100755 --- a/prepare +++ b/prepare @@ -114,11 +114,11 @@ echo "/* Automatically generated by ./prepare */" >$file echo "#define SILC_VERSION_STRING \"$version\"" >>$file echo "#define SILC_DIST_VERSION_STRING \"$dist_version\"" >>$file echo "#define SILC_PROTOCOL_VERSION_STRING \"SILC-1.0-$version\"" >>$file +echo "#define SILC_NAME \"SILC $distribution\"" >>$file # preparing irssi cd irssi -#sh autogen.sh 2>/dev/null 1>/dev/null -sh autogen.sh +sh autogen.sh 2>/dev/null 1>/dev/null cd .. file=irssi/irssi-version.h.in version_date=`date +%Y%m%d` diff --git a/prepare-clean b/prepare-clean index f7ad79f8..d229699b 100755 --- a/prepare-clean +++ b/prepare-clean @@ -30,6 +30,7 @@ make distclean -k rm -f Makefile.am rm -f Makefile.defines rm -f Makefile.defines.in +rm -f Makefile.defines_int rm -f Makefile.defines_int.in rm -f irssi/Makefile.defines rm -f irssi/Makefile.defines.in