mirror of git://git.gnupg.org/gnupg.git
* configure.ac (ALL_LINUGAS): Removed.
* Makefile.am (ACLOCAL_AMFLAGS): New. * configure.ac (AM_GNU_GETTEXT_VERSION): New. Set to 0.11.5.
This commit is contained in:
Werner Koch
parent
687d5bafaa
commit
8cdc83cdb5
20
ChangeLog
20
ChangeLog
|
|
@ -1,3 +1,23 @@
|
|||
2003-04-29 Werner Koch <wk@gnupg.org>
|
||||
|
||||
* configure.ac (ALL_LINUGAS): Removed.
|
||||
* Makefile.am (ACLOCAL_AMFLAGS): New.
|
||||
* configure.ac (AM_GNU_GETTEXT_VERSION): New. Set to 0.11.5.
|
||||
|
||||
2003-04-29 gettextize <bug-gnu-gettext@gnu.org>
|
||||
|
||||
* Makefile.am (SUBDIRS): Add m4.
|
||||
(ACLOCAL_AMFLAGS): New variable.
|
||||
(EXTRA_DIST): Add scripts/config.rpath.
|
||||
* configure.ac (AC_CONFIG_FILES): Add m4/Makefile.
|
||||
|
||||
2003-04-29 Werner Koch <wk@gnupg.org>
|
||||
|
||||
* assuan/ : Removed. We now use libassuan.
|
||||
* Makefile.am (SUBDIRS): Removed assuan
|
||||
|
||||
* configure.ac: Check for libassuan.
|
||||
|
||||
2003-01-09 Werner Koch <wk@gnupg.org>
|
||||
|
||||
* configure.ac (GNUPG_PROTECT_TOOL): New option --with-protect-tool.
|
||||
|
|
|
|||
|
|
@ -19,7 +19,9 @@
|
|||
|
||||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
EXTRA_DIST = autogen.sh
|
||||
ACLOCAL_AMFLAGS = -I m4
|
||||
|
||||
EXTRA_DIST = scripts/config.rpath autogen.sh
|
||||
|
||||
if BUILD_GPGSM
|
||||
sm = sm
|
||||
|
|
@ -37,11 +39,9 @@ else
|
|||
scd =
|
||||
endif
|
||||
|
||||
SUBDIRS = intl jnlib assuan common kbx ${sm} ${agent} ${scd} po doc tests
|
||||
SUBDIRS = m4 intl jnlib common kbx ${sm} ${agent} ${scd} po doc tests
|
||||
|
||||
|
||||
dist-hook:
|
||||
@set -e; echo "$(VERSION)" > $(distdir)/VERSION
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
5
README
5
README
|
|
@ -2,15 +2,14 @@ GnuPG 1.9 is a temporary protect to work on GnuPG extensions. It will
|
|||
eventually lead to a GnuPG 2.0 release.
|
||||
|
||||
jnlib/ utility functions
|
||||
assuan/ assuan protocol library
|
||||
kbx/ keybox library
|
||||
sm/ the gpgsm program
|
||||
agent/ the gpg-agent
|
||||
scd/ the smartcard daemon
|
||||
|
||||
Libksba and Libgcrypt are required to build it.
|
||||
Libassuan, Libksba and Libgcrypt are required to build it.
|
||||
|
||||
Assuan and Keybox are both designed to be source include-able.
|
||||
Keybox is designed to be source include-able.
|
||||
|
||||
A texinfo manual `gnupg.info' will get installed. Some commands and
|
||||
options given below.
|
||||
|
|
|
|||
15
TODO
15
TODO
|
|
@ -55,4 +55,19 @@ might want to have an agent context for each service request
|
|||
* sm/export.c
|
||||
** Return an error code or a status info per user ID.
|
||||
|
||||
* ALL
|
||||
** Return IMPORT_OK status.
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
67
acinclude.m4
67
acinclude.m4
|
|
@ -287,6 +287,73 @@ AC_DEFUN(AM_PATH_LIBGCRYPT,
|
|||
AC_SUBST(LIBGCRYPT_LIBS)
|
||||
])
|
||||
|
||||
dnl [copied from libassuan 0.0.1]
|
||||
dnl AM_PATH_LIBASSUAN([MINIMUM-VERSION,
|
||||
dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
|
||||
dnl Test for libassuan and define LIBASSUAN_CFLAGS and LIBASSUAN_LIBS
|
||||
dnl
|
||||
AC_DEFUN(AM_PATH_LIBASSUAN,
|
||||
[ AC_ARG_WITH(libassuan-prefix,
|
||||
AC_HELP_STRING([--with-libassuan-prefix=PFX],
|
||||
[prefix where LIBASSUAN is installed (optional)]),
|
||||
libassuan_config_prefix="$withval", libassuan_config_prefix="")
|
||||
if test x$libassuan_config_prefix != x ; then
|
||||
libassuan_config_args="$libassuan_config_args --prefix=$libassuan_config_prefix"
|
||||
if test x${LIBASSUAN_CONFIG+set} != xset ; then
|
||||
LIBASSUAN_CONFIG=$libassuan_config_prefix/bin/libassuan-config
|
||||
fi
|
||||
fi
|
||||
|
||||
AC_PATH_PROG(LIBASSUAN_CONFIG, libassuan-config, no)
|
||||
min_libassuan_version=ifelse([$1], ,0.0.1,$1)
|
||||
AC_MSG_CHECKING(for LIBASSUAN - version >= $min_libassuan_version)
|
||||
ok=no
|
||||
if test "$LIBASSUAN_CONFIG" != "no" ; then
|
||||
req_major=`echo $min_libassuan_version | \
|
||||
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
|
||||
req_minor=`echo $min_libassuan_version | \
|
||||
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
|
||||
req_micro=`echo $min_libassuan_version | \
|
||||
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
|
||||
libassuan_config_version=`$LIBASSUAN_CONFIG $libassuan_config_args --version`
|
||||
major=`echo $libassuan_config_version | \
|
||||
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
|
||||
minor=`echo $libassuan_config_version | \
|
||||
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
|
||||
micro=`echo $libassuan_config_version | \
|
||||
sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
|
||||
if test "$major" -gt "$req_major"; then
|
||||
ok=yes
|
||||
else
|
||||
if test "$major" -eq "$req_major"; then
|
||||
if test "$minor" -gt "$req_minor"; then
|
||||
ok=yes
|
||||
else
|
||||
if test "$minor" -eq "$req_minor"; then
|
||||
if test "$micro" -ge "$req_micro"; then
|
||||
ok=yes
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
if test $ok = yes; then
|
||||
LIBASSUAN_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --cflags`
|
||||
LIBASSUAN_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --libs`
|
||||
AC_MSG_RESULT(yes)
|
||||
ifelse([$2], , :, [$2])
|
||||
else
|
||||
LIBASSUAN_CFLAGS=""
|
||||
LIBASSUAN_LIBS=""
|
||||
AC_MSG_RESULT(no)
|
||||
ifelse([$3], , :, [$3])
|
||||
fi
|
||||
AC_SUBST(LIBASSUAN_CFLAGS)
|
||||
AC_SUBST(LIBASSUAN_LIBS)
|
||||
])
|
||||
|
||||
|
||||
|
||||
dnl [Copied from libksba]
|
||||
dnl AM_PATH_KSBA([MINIMUM-VERSION,
|
||||
|
|
|
|||
|
|
@ -150,11 +150,11 @@ fi
|
|||
#echo "Running libtoolize... Ignore non-fatal messages."
|
||||
#echo "no" | libtoolize
|
||||
|
||||
echo "Running gettextize... Ignore non-fatal messages."
|
||||
echo "no" | gettextize
|
||||
echo "Running autopoint"
|
||||
autopoint
|
||||
|
||||
echo "Running $aclocal"
|
||||
$aclocal
|
||||
echo "Running $aclocal -I m4"
|
||||
$aclocal -I m4
|
||||
echo "Running autoheader..."
|
||||
autoheader
|
||||
echo "Running $automake --gnu -a"
|
||||
|
|
|
|||
35
configure.ac
35
configure.ac
|
|
@ -1,5 +1,5 @@
|
|||
# configure.ac - for NewPG
|
||||
# Copyright (C) 2001, 2002 Free Software Foundation, Inc,
|
||||
# configure.ac - for GnuPG 1.9
|
||||
# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc,
|
||||
#
|
||||
# This file is part of GnuPG.
|
||||
#
|
||||
|
|
@ -21,15 +21,17 @@
|
|||
AC_PREREQ(2.52)
|
||||
# Version number: Remember to change it immediately *after* a release.
|
||||
# Add a "-cvs" prefix for non-released code.
|
||||
AC_INIT(newpg, 1.9.0-cvs, gnupg-devel@gnupg.org)
|
||||
AC_INIT(gnupg, 1.9.0-cvs, gnupg-devel@gnupg.org)
|
||||
NEED_LIBGCRYPT_VERSION=1.1.8
|
||||
NEED_LIBASSUAN_VERSION=0.0.1
|
||||
NEED_KSBA_VERSION=0.4.6
|
||||
NEED_OPENSC_VERSION=0.7.0
|
||||
ALL_LINGUAS="de"
|
||||
|
||||
PACKAGE=$PACKAGE_NAME
|
||||
VERSION=$PACKAGE_VERSION
|
||||
|
||||
AM_GNU_GETTEXT_VERSION(0.11.5)
|
||||
|
||||
AC_CONFIG_AUX_DIR(scripts)
|
||||
AC_CONFIG_SRCDIR(sm/gpgsm.c)
|
||||
AM_CONFIG_HEADER(config.h)
|
||||
|
|
@ -37,6 +39,7 @@ AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
|
|||
AM_MAINTAINER_MODE
|
||||
|
||||
# Some status variables to give feedback at the end of a configure run
|
||||
habe_libassuan=no
|
||||
have_ksba=no
|
||||
have_opensc=no
|
||||
have_pth=no
|
||||
|
|
@ -214,6 +217,21 @@ AM_PATH_LIBGCRYPT("$NEED_LIBGCRYPT_VERSION",,
|
|||
]]))
|
||||
|
||||
|
||||
#
|
||||
# libassuan is used for IPC
|
||||
#
|
||||
AM_PATH_LIBASSUAN("$NEED_LIBASSUAN_VERSION",
|
||||
have_libasssuan=yes,have_libasssun=no)
|
||||
if test "$have_libassuan" = "no"; then
|
||||
AC_MSG_ERROR([[
|
||||
***
|
||||
*** You need libassuan to build this program..
|
||||
*** It should be available at the same place you
|
||||
*** got this software.
|
||||
***]])
|
||||
fi
|
||||
|
||||
|
||||
#
|
||||
# libksba is our X.509 support library
|
||||
#
|
||||
|
|
@ -268,10 +286,8 @@ fi
|
|||
AC_SUBST(PTH_CFLAGS)
|
||||
AC_SUBST(PTH_LIBS)
|
||||
|
||||
|
||||
AM_GNU_GETTEXT
|
||||
|
||||
|
||||
# Checks for header files.
|
||||
AC_HEADER_STDC
|
||||
AC_CHECK_HEADERS([string.h locale.h])
|
||||
|
|
@ -343,12 +359,11 @@ AM_CONDITIONAL(BUILD_AGENT, test "$build_agent" = "yes")
|
|||
AM_CONDITIONAL(BUILD_SCDAEMON, test "$build_scdaemon" = "yes")
|
||||
|
||||
|
||||
AC_CONFIG_FILES([
|
||||
AC_CONFIG_FILES([ m4/Makefile
|
||||
Makefile
|
||||
intl/Makefile
|
||||
po/Makefile.in
|
||||
intl/Makefile
|
||||
jnlib/Makefile
|
||||
assuan/Makefile
|
||||
common/Makefile
|
||||
kbx/Makefile
|
||||
sm/Makefile
|
||||
|
|
@ -361,7 +376,7 @@ AC_OUTPUT
|
|||
|
||||
|
||||
echo "
|
||||
NewPG v${VERSION} has been configured as follows:
|
||||
GnuPG v${VERSION} has been configured as follows:
|
||||
|
||||
OpenPGP: $build_gpg
|
||||
S/MIME: $build_gpgsm
|
||||
|
|
|
|||
Loading…
Reference in New Issue