diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | Makefile.am | 10 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | README | 5 | ||||
| -rw-r--r-- | acinclude.m4 | 15 | ||||
| -rwxr-xr-x | autogen.sh | 5 | ||||
| -rw-r--r-- | configure.ac | 11 |
7 files changed, 41 insertions, 19 deletions
@@ -1,3 +1,15 @@ +2001-12-18 Werner Koch <wk@gnupg.org> + + Released 1.1.5. + + * Makefile.am (dist-hook): Only look in mpi and scripts for + distfiles; this way we don't include those of a stale "make dist" + directory. + + * acinclude.m4 (GNUPG_FIX_HDR_VERSION): Make it work with the new + automake. + * configure.ac: Don't chmod db2any. + 2001-08-06 Werner Koch <wk@gnupg.org> * configure.ac: Removed cross compiling hacks. diff --git a/Makefile.am b/Makefile.am index 86e2813c..193cdc7d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,16 +1,17 @@ ## Process this file with automake to produce Makefile.in SUBDIRS = jnlib mpi cipher src doc tests -EXTRA_DIST = README-alpha BUGS +EXTRA_DIST = README-alpha BUGS autogen.sh DISTCLEANFILES = gcrypt-defs.h # Add all the files listed in "distfiles" files to the distribution, # apply version number s to some files and create a VERSION file which -# we need for the Prereq: patch file trick. +# we need for the Prereq: patch file trick. dist-hook: @set -e; \ - for file in `cd $(top_srcdir); find . -type f -name distfiles`; do \ + for file in `cd $(top_srcdir); \ + find mpi scripts -type f -name distfiles`; do \ dir=`dirname $$file` ; $(mkinstalldirs) $(distdir)/$$dir ; \ for i in distfiles `cat $(top_srcdir)/$$file` ; do \ ln $(top_srcdir)/$$dir/$$i $(distdir)/$$dir/$$i 2> /dev/null \ @@ -21,3 +22,6 @@ dist-hook: echo "$(VERSION)" > $(distdir)/VERSION + + + @@ -1,4 +1,4 @@ -Noteworthy changes in version 1.1.5 () +Noteworthy changes in version 1.1.5 (2001-12-18) ------------------------------------------------ * gcry_{cipher,md}_map_name are now able to map stringified object IDs. @@ -13,9 +13,8 @@ except that new functions may be added in the future. This is a development version, the first stable version will be 1.2.0. If you are using the CVS version, make sure that you have the latest -automake (I am using Debian Sid). Ignore the make warnings about -overriding old rules. I had to include ltmain.sh two times due to -autoconf/libtool mismatches. +automake (I am using Debian Sid) and run ./autogen.sh to create +configure. diff --git a/acinclude.m4 b/acinclude.m4 index e1d74f52..2e0a3743 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -48,20 +48,23 @@ AC_DEFUN(GNUPG_CHECK_TYPEDEF, dnl GNUPG_FIX_HDR_VERSION(FILE, NAME) dnl Make the version number in gcrypt/gcrypt.h the same as the one here. dnl (this is easier than to have a .in file just for one substitution) +dnl We must use a temp file in the current directory because make distcheck +dnl install all sourcefiles RO. dnl AC_DEFUN(GNUPG_FIX_HDR_VERSION, - [ sed "s/^#define $2 \".*/#define $2 \"$VERSION\"/" $srcdir/$1 > $srcdir/$1.tmp - if cmp -s $srcdir/$1 $srcdir/$1.tmp 2>/dev/null; then - rm -f $srcdir/$1.tmp + [ sed "s/^#define $2 \".*/#define $2 \"$VERSION\"/" $srcdir/$1 > fixhdr.tmp + if cmp -s $srcdir/$1 fixhdr.tmp 2>/dev/null; then + rm -f fixhdr.tmp else rm -f $srcdir/$1 - if mv $srcdir/$1.tmp $srcdir/$1 ; then + if mv fixhdr.tmp $srcdir/$1 ; then : else AC_MSG_ERROR([[ +*** *** Failed to fix the version string macro $2 in $1. -*** The old file has been saved as $1.tmp - ]]) +*** The old file has been saved as fixhdr.tmp +***]]) fi AC_MSG_WARN([fixed the $2 macro in $1]) fi diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 00000000..41ae4e27 --- /dev/null +++ b/autogen.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +autogen_sh="`dirname $0`/scripts/autogen.sh" +exec $autogen_sh $* + diff --git a/configure.ac b/configure.ac index d001b0b6..2217d334 100644 --- a/configure.ac +++ b/configure.ac @@ -23,12 +23,12 @@ AC_REVISION($Revision$)dnl AC_PREREQ(2.52) # Version numbers (Remember to change them just before a release) # (Interfaces removed: CURRENT++, AGE=0, REVISION=0) -# X (Interfaces added: CURRENT++, AGE++, REVISION=0) +# (Interfaces added: CURRENT++, AGE++, REVISION=0) # (No interfaces changed: REVISION++) -AC_INIT(libgcrypt,1.1.4b-cvs) -LIBGCRYPT_LT_CURRENT=2 -LIBGCRYPT_LT_AGE=1 -LIBGCRYPT_LT_REVISION=1 +AC_INIT(libgcrypt,1.1.5) +LIBGCRYPT_LT_CURRENT=3 +LIBGCRYPT_LT_AGE=2 +LIBGCRYPT_LT_REVISION=0 #----------------------- PACKAGE=$PACKAGE_NAME @@ -726,7 +726,6 @@ AC_SUBST(LIBGCRYPT_LIBS) AC_SUBST(LIBGCRYPT_CFLAGS) AC_CONFIG_COMMANDS([gcrypt-defs],[[ -chmod +x scripts/db2any chmod +x src/libgcrypt-config cat >gcrypt-defs.tmp <<G10EOF /* Generated automatically by configure */ |