From 54629f721b429256c3586ecfdbf3b5b97963fe35 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Sat, 13 Feb 1999 11:19:14 +0000 Subject: [PATCH] See ChangeLog: Sat Feb 13 12:14:42 CET 1999 Werner Koch --- ChangeLog | 5 +++++ Makefile.am | 2 +- THANKS | 1 + TODO | 5 +++++ acinclude.m4 | 7 ++++--- configure.in | 13 ++++++++++--- mpi/ChangeLog | 4 ++++ mpi/Makefile.am | 2 +- po/Makefile.in.in | 13 +++++-------- scripts/ChangeLog | 4 ++++ scripts/autogen.sh | 11 ++++++++--- scripts/mkwebpage | 9 ++++++++- zlib/ChangeLog | 4 ++++ zlib/Makefile.am | 2 -- 14 files changed, 60 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index 526f33eb6..3e99e5cd6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Feb 13 12:04:43 CET 1999 Werner Koch + + * configure.in: Changed detection of compiler flags. + * intl/ : Removed directory + Wed Feb 10 17:15:39 CET 1999 Werner Koch * acinclude.m4 (GNUPG_CHECK_RDYNAMIC): Fix for freebsd 2.2 diff --git a/Makefile.am b/Makefile.am index a12267d17..d5bbd0a6c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = intl po zlib util mpi cipher tools g10 doc checks +SUBDIRS = intl zlib util mpi cipher tools g10 po doc checks EXTRA_DIST = VERSION PROJECTS all-am: g10defs.h diff --git a/THANKS b/THANKS index e880ad224..52df027df 100644 --- a/THANKS +++ b/THANKS @@ -63,6 +63,7 @@ Paul D. Smith psmith@baynetworks.com Peter Gutmann pgut001@cs.auckland.ac.nz QingLong qinglong@bolizm.ihep.su Ralph Gillen gillen@theochem.uni-duesseldorf.de +Reinhard Wobst R.Wobst@ifw-dresden.de Reuben Sumner rasumner@wisdom.weizmann.ac.il Roddy Strachan roddy@satlink.com.au Roland Rosenfeld roland@spinnaker.rhein.de diff --git a/TODO b/TODO index e1dbfb29b..85367e82f 100644 --- a/TODO +++ b/TODO @@ -11,6 +11,8 @@ Bugs * README does not verify okay. verify inserts an extra CR,LF just before "Esoteric Command" (after ~8k of text). + * Did I add -lsocket and -lnls for Solaris? + Important ---------- * replace gettext by a non exploitable one. @@ -26,6 +28,9 @@ Important Needed ------ + * encrypttoself, damit keine Angabe von -r immer noch zu einer + abfrage führt. + * remove more "Fixmes" * Replace Blowfish by Twofish and add the new encrypted packet type diff --git a/acinclude.m4 b/acinclude.m4 index 42c4ffb35..496624c89 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -200,13 +200,14 @@ define(GNUPG_CHECK_RDYNAMIC, AC_MSG_RESULT(assume none) else case "$host_os" in - solaris*) + solaris* ) CFLAGS_RDYNAMIC="-Wl,-dy" ;; - freebsd2*) + + freebsd2* | osf4* ) CFLAGS_RDYNAMIC="" ;; - *) + * ) CFLAGS_RDYNAMIC="-Wl,-export-dynamic" ;; esac diff --git a/configure.in b/configure.in index 6ea0a81ac..0bd463e59 100644 --- a/configure.in +++ b/configure.in @@ -59,9 +59,6 @@ else fi if test "$use_m_guard" = yes ; then AC_DEFINE(M_GUARD) - CFLAGS="$CFLAGS -g" -else - CFLAGS="$CFLAGS -O2" fi @@ -91,10 +88,18 @@ AC_PROG_INSTALL dnl AC_CYGWIN32 +MPI_OPT_FLAGS="" if test "$GCC" = yes; then CFLAGS="$CFLAGS -Wall" + dnl Always enable optimazation in MPI + if echo "$CFLAGS" | grep "-O" >/dev/null ; then + : + else + MPI_OPT_FLAGS=-O2 + fi fi + try_gettext=yes try_gdbm=yes case "${target}" in @@ -130,6 +135,7 @@ case "${target}" in ;; esac +AC_SUBST(MPI_OPT_FLAGS) GNUPG_CHECK_PIC GNUPG_CHECK_RDYNAMIC @@ -169,6 +175,7 @@ case "${target}" in esac AC_DEFINE_UNQUOTED(NAME_OF_DEV_RANDOM, "$NAME_OF_DEV_RANDOM") AC_DEFINE_UNQUOTED(NAME_OF_DEV_URANDOM, "$NAME_OF_DEV_URANDOM") +AC_SUBST(MPI_OPT_FLAGS) dnl Checks for libraries. diff --git a/mpi/ChangeLog b/mpi/ChangeLog index 2a49d403b..24d1defc6 100644 --- a/mpi/ChangeLog +++ b/mpi/ChangeLog @@ -1,3 +1,7 @@ +Sat Feb 13 12:04:43 CET 1999 Werner Koch + + * Makefile.am: Removed the +=. Add MPI_OPT_FLAGS. + Sat Jan 9 16:02:23 CET 1999 Werner Koch * mpi-cmp.c (mpi_cmp_ui): Normalized the arg. diff --git a/mpi/Makefile.am b/mpi/Makefile.am index 8a302888a..6fb7adda0 100644 --- a/mpi/Makefile.am +++ b/mpi/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in INCLUDES = -I$(top_srcdir)/include -CFLAGS += -O2 +CFLAGS = @CFLAGS@ @MPI_OPT_FLAGS@ SFLAGS = @MPI_SFLAGS@ SUFFIXES = .S .s diff --git a/po/Makefile.in.in b/po/Makefile.in.in index 0503ac5f5..111b40fcb 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -26,8 +26,7 @@ subdir = po INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ -### This doe not work: MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@ -MKINSTALLDIRS = $(top_srcdir)/scripts/mkinstalldirs +MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@ CC = @CC@ GENCAT = @GENCAT@ @@ -44,7 +43,7 @@ INCLUDES = -I.. -I$(top_srcdir)/intl COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) -SOURCES = cat-id-tbl.c de.glo +SOURCES = cat-id-tbl.c POFILES = @POFILES@ GMOFILES = @GMOFILES@ DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \ @@ -52,8 +51,6 @@ stamp-cat-id $(POFILES) $(GMOFILES) $(SOURCES) POTFILES = \ - - CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ INSTOBJEXT = @INSTOBJEXT@ @@ -123,7 +120,7 @@ install-data-yes: all cat=`basename $$cat`; \ case "$$cat" in \ *.gmo) destdir=$(gnulocaledir);; \ - *) destdir=$(localedir);; \ + *) destdir=$(localedir);; \ esac; \ lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ dir=$$destdir/$$lang/LC_MESSAGES; \ @@ -235,8 +232,8 @@ POTFILES: POTFILES.in posrcprefix="../"; \ fi; \ rm -f $@-t $@ \ - && (sed -e '/^#/d' -e '/^[ ]*$$/d' \ - -e "s@.*@ $$posrcprefix& \\\\@" < $(srcdir)/$@.in \ + && (sed -e '/^#/d' -e '/^[ ]*$$/d' \ + -e "s@.*@ $$posrcprefix& \\\\@" < $(srcdir)/$@.in \ | sed -e '$$s/\\$$//') > $@-t \ && chmod a-w $@-t \ && mv $@-t $@ ) diff --git a/scripts/ChangeLog b/scripts/ChangeLog index a2b6e9019..c14ea7298 100644 --- a/scripts/ChangeLog +++ b/scripts/ChangeLog @@ -1,3 +1,7 @@ +Sat Feb 13 12:04:43 CET 1999 Werner Koch + + * autogen.sh: Now uses gettextize + Wed Feb 10 17:15:39 CET 1999 Werner Koch * config.sub, config.guess: Support i386-emx-os2 diff --git a/scripts/autogen.sh b/scripts/autogen.sh index 813786c7f..c49e81371 100755 --- a/scripts/autogen.sh +++ b/scripts/autogen.sh @@ -46,17 +46,22 @@ if (gettext --version /dev/null | awk 'NR==1 { split($4,A,"\."); \ fi - if test "$DIE" = "yes"; then exit 1 fi +echo "Running gettextize... Ignore non-fatal messages." +echo "no" | gettextize --force + +echo "Running aclocal..." aclocal +echo "Running autoheader..." autoheader +echo "Running automake --gnu ..." automake --gnu; -autoheader +echo "Running autoconf..." autoconf -echo "Ready to run ./configure" +echo "You can now run \"./configure\" and then \"make\"." diff --git a/scripts/mkwebpage b/scripts/mkwebpage index f6b9dbd2b..769b15623 100755 --- a/scripts/mkwebpage +++ b/scripts/mkwebpage @@ -1,5 +1,8 @@ #!/bin/sh # Make a snapshot of the CVS head revision for the gnupg webpages +# and put them into the FTP directory (so that the mirrors w/o rsync +# can access them + set -e @@ -13,7 +16,7 @@ fix_it () { [ This is a snapshot of the NEWS file from the CVS head revision. You will find the NEWS for the latest revision below the line "Noteworthy changes in version 0.x.y". - (wk $(date +%Y-%m-%d)) ] + (wk $(date +%Y-%m-%d)) ] EOF @@ -46,6 +49,10 @@ do_export () { do_export gnupg-www gnupg-www +cd gnupg-www +tar czf /home/ftp/pub/gcrypt/old/webpages.tmp * +mv /home/ftp/pub/gcrypt/old/webpages.tmp /home/ftp/pub/gcrypt/old/webpages.tar.gz + exit 0 diff --git a/zlib/ChangeLog b/zlib/ChangeLog index 67a513941..69965ba90 100644 --- a/zlib/ChangeLog +++ b/zlib/ChangeLog @@ -1,3 +1,7 @@ +Sat Feb 13 12:04:43 CET 1999 Werner Koch + + * Makefile.am: Removed -Wall + Wed Jan 20 21:40:21 CET 1999 Werner Koch * Makefile.am: Corrected the list of sources diff --git a/zlib/Makefile.am b/zlib/Makefile.am index 91610af4d..2c1e9cda4 100644 --- a/zlib/Makefile.am +++ b/zlib/Makefile.am @@ -3,8 +3,6 @@ # For conditions of distribution and use, see copyright notice in zlib.h # This is used if a systems lacks support of zlib -CFLAGS = -O -Wall - EXTRA_DIST = README algorithm.doc ChangeLog # I found no other easy way to use this only if zlib is neede