diff options
| -rw-r--r-- | ChangeLog | 21 | ||||
| -rwxr-xr-x | autogen.sh | 2 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 11 | ||||
| -rw-r--r-- | src/err-codes.h.in | 2 | ||||
| -rw-r--r-- | src/err-sources.h.in | 1 |
6 files changed, 34 insertions, 7 deletions
@@ -1,3 +1,16 @@ +2004-03-09 Werner Koch <[email protected]> + + * src/Makefile.am (mkerrcodes.h): Let CPP work on a temporary file. + (CLEANFILES): Add that temporary file. + * configure.ac (AC_PROG_CPP): Added. + + * src/err-codes.h.in: Removed trailing spaces from + GPG_ERR_NOT_LOCKED. + +2004-03-08 Werner Koch <[email protected]> + + * src/err-sources.h.in: Added GPG_ERR_SOURCE_GSTI. + 2004-03-07 Marcus Brinkmann <[email protected]> Released 0.7. @@ -71,6 +84,14 @@ * src/gpg-error.h: File removed. * src/gpg-error.c: New file. +2004-02-18 Werner Koch <[email protected]> + + * src/gpg-error-config.in: Ignore setting of --prefix. + +2004-02-11 Werner Koch <[email protected]> + + * autogen.sh (check_version): Removed bashism and simplified. + 2004-02-03 Werner Koch <[email protected]> * src/gpg-error.h: Added GPG_ERR_NOT_LOCKED. @@ -18,7 +18,7 @@ cvtver () { } check_version () { - if [ $(( `("$1" --version || echo "0") | cvtver` >= $2 )) == 1 ]; then + if [ `("$1" --version || echo "0") | cvtver` -ge "$2" ]; then return 0 fi echo "**Error**: "\`$1\'" not installed or too old." >&2 diff --git a/configure.ac b/configure.ac index de18365..4137035 100644 --- a/configure.ac +++ b/configure.ac @@ -21,8 +21,7 @@ # The following lines are used by ./autogen.sh. AC_PREREQ(2.57) min_automake_version="1.7.6" -# The gettext version is set below using AM_GNU_GETTEXT_VERSION. - +# The gettext version is set below using AM_GNU_GETTEXT_VERSION # Version number: Remember to change it immediately *after* a release. AC_INIT(libgpg-error, 0.8-cvs, [email protected]) # LT Version numbers, remember to change them just *before* a release. @@ -45,6 +44,7 @@ AC_CONFIG_HEADER([config.h]) # Checks for programs. AC_PROG_CC +AC_PROG_CPP AC_PROG_LIBTOOL AC_PROG_AWK diff --git a/src/Makefile.am b/src/Makefile.am index 4f333df..e67d49f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,11 +25,15 @@ EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \ mkerrcodes.awk mkerrcodes1.awk mkerrcodes2.awk mkerrcodes.c \ mkheader.awk gpg-error.h.in \ err-sources.h err-codes.h gpg-error-config.in gpg-error.m4 + BUILT_SOURCES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \ err-sources-sym.h err-codes-sym.h errnos-sym.h gpg-error.h + +tmp_files = _mkerrcodes.h + CLEANFILES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \ gpg-error.h mkerrcodes mkerrcodes.h \ - err-sources-sym.h err-codes-sym.h errnos-sym.h + err-sources-sym.h err-codes-sym.h errnos-sym.h $(tmp_files) bin_SCRIPTS = gpg-error-config m4datadir = $(datadir)/aclocal @@ -72,8 +76,9 @@ code-to-errno.h: Makefile mkerrnos.awk errnos.in # It is correct to use $(CPP). We want the host's idea of the error codes. mkerrcodes.h: Makefile mkerrcodes.awk - $(AWK) -f $(srcdir)/mkerrcodes1.awk $(srcdir)/errnos.in \ - | $(CPP) - | grep GPG_ERR_ | $(AWK) -f $(srcdir)/mkerrcodes.awk >$@ + $(AWK) -f $(srcdir)/mkerrcodes1.awk $(srcdir)/errnos.in >_$@ + $(CPP) _$@ | grep GPG_ERR_ | $(AWK) -f $(srcdir)/mkerrcodes.awk >$@ + -rm _$@ # It is correct to use $(CC_FOR_BUILD) here. We want to run the # program at build time. diff --git a/src/err-codes.h.in b/src/err-codes.h.in index b70faea..e05b6f8 100644 --- a/src/err-codes.h.in +++ b/src/err-codes.h.in @@ -196,7 +196,7 @@ 164 GPG_ERR_INV_CERT_OBJ Invalid certificate object 165 GPG_ERR_UNKNOWN_NAME Unknown name 166 GPG_ERR_LOCALE_PROBLEM A locale function failed -167 GPG_ERR_NOT_LOCKED Not locked +167 GPG_ERR_NOT_LOCKED Not locked # 168 to 199 are free to be used. diff --git a/src/err-sources.h.in b/src/err-sources.h.in index af072bd..9af23fd 100644 --- a/src/err-sources.h.in +++ b/src/err-sources.h.in @@ -40,6 +40,7 @@ 8 GPG_ERR_SOURCE_KEYBOX Keybox 9 GPG_ERR_SOURCE_KSBA KSBA 10 GPG_ERR_SOURCE_DIRMNGR Dirmngr +11 GPG_ERR_SOURCE_GSTI GSTI # 11 to 31 are free to be used. |