mirror of
git://git.gnupg.org/gnupg.git
synced 2025-02-01 16:33:02 +01:00
Removed the libgcrypt stuff and started to modify the source to work with
that external library.
This commit is contained in:
Werner Koch
parent
c58fdc9c2f
commit
613c15be88
@ -1,3 +1,8 @@
|
||||
2000-12-19 Werner Koch <wk@gnupg.org>
|
||||
|
||||
Removed the stuff which is now in libgcrypt. These are
|
||||
mainly the directories mpi/, cipher/ and gcrypt/.
|
||||
|
||||
2000-11-14 Werner Koch <wk@gnupg.org>
|
||||
|
||||
Version 1.1.2 released.
|
||||
|
||||
31
Makefile.am
31
Makefile.am
@ -1,16 +1,5 @@
|
||||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
#if COMPILE_LIBGCRYPT
|
||||
#gcrypt = gcrypt
|
||||
#my_clean_gcrypt =
|
||||
#else
|
||||
#gcrypt =
|
||||
#my_clean_gcrypt = gcrypt/Makefile
|
||||
#endif
|
||||
|
||||
gcrypt = gcrypt
|
||||
my_clean_gcrypt =
|
||||
|
||||
if CROSS_COMPILING
|
||||
checks =
|
||||
else
|
||||
@ -23,13 +12,13 @@ else
|
||||
agent =
|
||||
endif
|
||||
|
||||
SUBDIRS = intl zlib jnlib util mpi cipher ${gcrypt} g10 po tools \
|
||||
SUBDIRS = intl zlib jnlib util g10 po tools \
|
||||
${agent} doc ${checks}
|
||||
EXTRA_DIST = README-alpha PROJECTS BUGS
|
||||
# gettext never gets it right, so we take here care of deleting the
|
||||
# symlink. my_clean_gcrypt is just a kludge until we can include
|
||||
# libgcrypt.
|
||||
DISTCLEANFILES = gnupg-defs.h intl/libintl.h ${my_clean_gcrypt}
|
||||
DISTCLEANFILES = gnupg-defs.h intl/libintl.h
|
||||
|
||||
|
||||
# Add all the files listed in "distfiles" files to the distribution,
|
||||
@ -51,20 +40,4 @@ dist-hook:
|
||||
echo "$(VERSION)" > $(distdir)/VERSION
|
||||
|
||||
|
||||
if MAINTAINER_MODE
|
||||
# This is only useful within my local environment (wk)
|
||||
cvs-get:
|
||||
rsync -Cavuzb --exclude scratch --exclude .deps \
|
||||
wkoch@sigtrap.guug.de:work/gnupg .
|
||||
|
||||
cvs-put:
|
||||
rsync -Cavuzb --exclude .deps --exclude scratch \
|
||||
. wkoch@sigtrap.guug.de:work/gnupg
|
||||
|
||||
cvs-sync: cvs-get cvs-put
|
||||
|
||||
endif
|
||||
|
||||
|
||||
.PHONY: cvs-get cvs-put cvs-sync
|
||||
|
||||
|
||||
4
NEWS
4
NEWS
@ -1,3 +1,7 @@
|
||||
|
||||
GnuPG now needs libgcrypt - you will find it at the same place
|
||||
where you got GnuPG.
|
||||
|
||||
Noteworthy changes in version 1.1.2
|
||||
-----------------------------------
|
||||
|
||||
|
||||
153
configure.in
153
configure.in
@ -12,92 +12,16 @@ AC_INIT(g10/gpg.c)
|
||||
AC_CONFIG_AUX_DIR(scripts)
|
||||
AM_CONFIG_HEADER(config.h)
|
||||
AC_CANONICAL_SYSTEM
|
||||
#############################################
|
||||
# Version numbers (Rember to change them just before a release)
|
||||
# 1. No interfaces changed, only implementations (good): Increment REVISION.
|
||||
# 2. Interfaces added, none removed (good): Increment CURRENT, increment
|
||||
# AGE, set REVISION to 0.
|
||||
# 3. Interfaces removed (BAD, breaks upward compatibility): Increment
|
||||
# CURRENT, set AGE and REVISION to 0.
|
||||
AM_INIT_AUTOMAKE(gnupg,1.1.2)
|
||||
LIBGCRYPT_LT_CURRENT=1
|
||||
LIBGCRYPT_LT_AGE=0
|
||||
LIBGCRYPT_LT_REVISION=0
|
||||
##############################################
|
||||
|
||||
AC_SUBST(LIBGCRYPT_LT_CURRENT)
|
||||
AC_SUBST(LIBGCRYPT_LT_AGE)
|
||||
AC_SUBST(LIBGCRYPT_LT_REVISION)
|
||||
|
||||
|
||||
AM_INIT_AUTOMAKE(gnupg,1.1.2a)
|
||||
|
||||
ALL_LINGUAS="da de eo es_ES fr id it ja nl pl pt_BR pt_PT ru sv"
|
||||
static_modules="sha1 md5 rmd160"
|
||||
static_random_module=""
|
||||
|
||||
AC_PROG_AWK
|
||||
|
||||
MODULES_IN_CIPHER=`$AWK '/^EXTRA_PROGRAMS/ { for(i=3;i<=NF;i++) print $i}' \
|
||||
$srcdir/cipher/Makefile.am`
|
||||
|
||||
dnl
|
||||
dnl Check for random module options
|
||||
dnl
|
||||
dnl Fixme: get the list of available modules from MODULES_IN_CIPHER
|
||||
dnl and check against this list
|
||||
|
||||
AC_MSG_CHECKING([which static random module to use])
|
||||
AC_ARG_ENABLE(static-rnd,
|
||||
[ --enable-static-rnd=[egd|unix|linux|none] ],
|
||||
[use_static_rnd=$enableval], [use_static_rnd=default] )
|
||||
|
||||
if test "$use_static_rnd" = no; then
|
||||
use_static_rnd=default
|
||||
fi
|
||||
|
||||
case "$use_static_rnd" in
|
||||
egd | linux | unix | none | default )
|
||||
AC_MSG_RESULT($use_static_rnd)
|
||||
;;
|
||||
* )
|
||||
AC_MSG_RESULT(invalid argument)
|
||||
AC_MSG_ERROR(there is no random module rnd$use_static_rnd)
|
||||
;;
|
||||
esac
|
||||
|
||||
AC_ARG_WITH(egd-socket,
|
||||
[ --with-egd-socket=NAME Use NAME for the EGD socket)],
|
||||
egd_socket_name="$withval", egd_socket_name="" )
|
||||
AC_DEFINE_UNQUOTED(EGD_SOCKET_NAME, "$egd_socket_name")
|
||||
|
||||
|
||||
|
||||
dnl
|
||||
dnl See whether the user wants to disable checking for /dev/random
|
||||
|
||||
AC_MSG_CHECKING([whether use of /dev/random is requested])
|
||||
AC_ARG_ENABLE(dev-random,
|
||||
[ --disable-dev-random disable the use of dev random],
|
||||
try_dev_random=$enableval, try_dev_random=yes)
|
||||
AC_MSG_RESULT($try_dev_random)
|
||||
|
||||
|
||||
dnl
|
||||
dnl Check other options
|
||||
dnl
|
||||
|
||||
AC_MSG_CHECKING([whether use of extensions is requested])
|
||||
AC_ARG_ENABLE(dynload,
|
||||
[ --disable-dynload disable use of extensions],
|
||||
try_dynload=$enableval, try_dynload=yes)
|
||||
AC_MSG_RESULT($try_dynload)
|
||||
|
||||
AC_MSG_CHECKING([whether assembler modules are requested])
|
||||
AC_ARG_ENABLE(asm,
|
||||
[ --disable-asm do not use assembler modules],
|
||||
try_asm_modules=$enableval, try_asm_modules=yes)
|
||||
AC_MSG_RESULT($try_asm_modules)
|
||||
|
||||
AC_MSG_CHECKING([whether memory debugging is requested])
|
||||
AC_ARG_ENABLE(m-debug,
|
||||
[ --enable-m-debug enable debugging of memory allocation],
|
||||
@ -124,17 +48,6 @@ AC_ARG_WITH(included-zlib,
|
||||
[g10_force_zlib=yes], [g10_force_zlib=no] )
|
||||
AC_MSG_RESULT($g10_force_zlib)
|
||||
|
||||
dnl
|
||||
dnl Check wether we want to compile libgcrypt
|
||||
dnl
|
||||
AC_MSG_CHECKING([whether compilation of libgcrypt is requested])
|
||||
AC_ARG_ENABLE(libgcrypt,
|
||||
[ --enable-libgcrypt compile the libgcrypt [default=yes]],
|
||||
[compile_libgcrypt="$enableval"],[compile_libgcrypt=no])
|
||||
AC_MSG_RESULT($compile_libgcrypt)
|
||||
AM_CONDITIONAL(COMPILE_LIBGCRYPT, test x$compile_libgcrypt = xyes)
|
||||
|
||||
|
||||
dnl
|
||||
dnl Check whether we want to use Linux capabilities
|
||||
dnl
|
||||
@ -189,17 +102,6 @@ GPH_PROG_DOCBOOK
|
||||
GNUPG_CHECK_FAQPROG
|
||||
|
||||
|
||||
dnl
|
||||
dnl Build shared libraries only when compilation of libgcrypt
|
||||
dnl has been requested
|
||||
dnl
|
||||
AM_DISABLE_STATIC
|
||||
AM_PROG_LIBTOOL
|
||||
|
||||
|
||||
MPI_OPT_FLAGS=""
|
||||
|
||||
|
||||
try_gettext=yes
|
||||
case "${target}" in
|
||||
*-*-mingw32*)
|
||||
@ -251,7 +153,6 @@ case "${target}" in
|
||||
;;
|
||||
esac
|
||||
|
||||
AC_SUBST(MPI_OPT_FLAGS)
|
||||
GNUPG_SYS_SYMBOL_UNDERSCORE
|
||||
GNUPG_CHECK_PIC
|
||||
GNUPG_CHECK_EXPORTDYNAMIC
|
||||
@ -318,7 +219,6 @@ 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.
|
||||
@ -650,42 +550,10 @@ echo '}' >>cipher/construct.c
|
||||
|
||||
|
||||
|
||||
|
||||
dnl
|
||||
dnl Figure how to link the cipher modules
|
||||
dnl
|
||||
AC_SUBST(STATIC_CIPHER_OBJS)
|
||||
AC_SUBST(DYNAMIC_CIPHER_MODS)
|
||||
|
||||
|
||||
dnl setup assembler stuff
|
||||
AC_MSG_CHECKING(for mpi assembler functions)
|
||||
if test -f $srcdir/mpi/config.links ; then
|
||||
. $srcdir/mpi/config.links
|
||||
GNUPG_LINK_FILES($mpi_ln_src, $mpi_ln_dst)
|
||||
ac_cv_mpi_extra_asm_modules="$mpi_extra_modules"
|
||||
ac_cv_mpi_sflags="$mpi_sflags"
|
||||
ac_cv_mpi_config_done="yes"
|
||||
AC_MSG_RESULT(done)
|
||||
else
|
||||
AC_MSG_RESULT(failed)
|
||||
AC_MSG_ERROR([mpi/config.links missing!])
|
||||
fi
|
||||
MPI_EXTRA_ASM_OBJS=""
|
||||
if test "$ac_cv_mpi_extra_asm_modules" != ""; then
|
||||
GNUPG_MSG_PRINT([mpi extra asm functions:])
|
||||
for i in $ac_cv_mpi_extra_asm_modules; do
|
||||
GNUPG_MSG_PRINT([$i])
|
||||
MPI_EXTRA_ASM_OBJS="$MPI_EXTRA_ASM_OBJS $i.lo"
|
||||
done
|
||||
AC_MSG_RESULT()
|
||||
fi
|
||||
AC_SUBST(MPI_EXTRA_ASM_OBJS)
|
||||
MPI_SFLAGS="$ac_cv_mpi_sflags"
|
||||
AC_SUBST(MPI_SFLAGS)
|
||||
|
||||
dnl Do we have zlib? Must do it here because Solaris failed
|
||||
dnl when compiling a conftest (due to the "-lz" from LIBS).
|
||||
dnl
|
||||
use_local_zlib=yes
|
||||
if test "$g10_force_zlib" = "yes"; then
|
||||
:
|
||||
@ -720,7 +588,6 @@ if echo "$VERSION" | sed 's/-.*//' | grep "$tmp_pat" >/dev/null ; then
|
||||
fi
|
||||
|
||||
dnl Temp workarounds
|
||||
GNUPG_LINK_FILES(gcrypt/gcrypt.h, gcrypt.h )
|
||||
GNUPG_LINK_FILES(include/types.h, types.h )
|
||||
|
||||
AM_CONDITIONAL(CROSS_COMPILING, test x$cross_compiling = xyes)
|
||||
@ -737,20 +604,9 @@ if test "$GCC" = yes; then
|
||||
fi
|
||||
fi
|
||||
|
||||
dnl
|
||||
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
|
||||
GNUPG_FIX_HDR_VERSION(gcrypt/gcrypt.h, GCRYPT_VERSION)
|
||||
|
||||
GCRYPT_LIBS="-L${libdir} -lgcrypt"
|
||||
GCRYPT_CFLAGS=""
|
||||
AC_SUBST(GCRYPT_LIBS)
|
||||
AC_SUBST(GCRYPT_CFLAGS)
|
||||
|
||||
AC_OUTPUT_COMMANDS([
|
||||
chmod +x scripts/db2html
|
||||
chmod +x gcrypt/gcrypt-config
|
||||
cat >gnupg-defs.tmp <<G10EOF
|
||||
/* Generated automatically by configure */
|
||||
#ifdef HAVE_DRIVE_LETTERS
|
||||
@ -793,8 +649,6 @@ intl/Makefile
|
||||
po/Makefile.in
|
||||
jnlib/Makefile
|
||||
util/Makefile
|
||||
mpi/Makefile
|
||||
cipher/Makefile
|
||||
g10/Makefile
|
||||
agent/Makefile
|
||||
doc/Makefile
|
||||
@ -802,8 +656,5 @@ doc/version.sgml
|
||||
tools/Makefile
|
||||
zlib/Makefile
|
||||
checks/Makefile
|
||||
gcrypt/Makefile
|
||||
gcrypt/gcrypt-config
|
||||
])
|
||||
|
||||
dnl *-*wedit:notab*-* Please keep this as the last line.
|
||||
|
||||
@ -3,11 +3,11 @@
|
||||
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl
|
||||
EXTRA_DIST = OPTIONS pubring.asc options.skel
|
||||
OMIT_DEPENDENCIES = zlib.h zconf.h
|
||||
LDFLAGS = -static @LDFLAGS@ @DYNLINK_LDFLAGS@
|
||||
LDFLAGS = -static @LDFLAGS@ @DYNLINK_LDFLAGS@ -lgcrypt
|
||||
# we need to add libutil.la a second time because we have to resolve
|
||||
# gpg_log_ in some libjnlib modules. - very ugly - should be removed soon.
|
||||
needed_libs = ../util/libutil.la ../gcrypt/libgcrypt.la \
|
||||
../jnlib/libjnlib.la ../util/libutil.la
|
||||
needed_libs = ../util/libutil.a \
|
||||
../jnlib/libjnlib.a ../util/libutil.a
|
||||
|
||||
#noinst_PROGRAMS = gpgd
|
||||
#bin_PROGRAMS = gpg kbxutil
|
||||
|
||||
@ -5,11 +5,10 @@ EXTRA_DIST = README xmalloc.c xmalloc.h logging.c logging.h
|
||||
|
||||
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl
|
||||
|
||||
noinst_LTLIBRARIES = libjnlib.la
|
||||
noinst_LIBRARIES = libjnlib.a
|
||||
|
||||
|
||||
libjnlib_la_LDFLAGS =
|
||||
libjnlib_la_SOURCES = libjnlib-config.h \
|
||||
libjnlib_a_SOURCES = libjnlib-config.h \
|
||||
argparse.c argparse.h \
|
||||
stringhelp.c stringhelp.h \
|
||||
dotlock.c dotlock.h \
|
||||
|
||||
@ -62,7 +62,7 @@ INSTOBJEXT = @INSTOBJEXT@
|
||||
$(COMPILE) $<
|
||||
|
||||
.po.pox:
|
||||
$(MAKE) $(PACKAGE).pot
|
||||
$(MAKE) $(srcdir)/$(PACKAGE).pot
|
||||
$(MSGMERGE) $< $(srcdir)/$(PACKAGE).pot -o $*.pox
|
||||
|
||||
.po.mo:
|
||||
@ -79,7 +79,7 @@ INSTOBJEXT = @INSTOBJEXT@
|
||||
|
||||
all: all-@USE_NLS@
|
||||
|
||||
all-yes: cat-id-tbl.c $(CATALOGS)
|
||||
all-yes: $(srcdir)/cat-id-tbl.c $(CATALOGS)
|
||||
all-no:
|
||||
|
||||
$(srcdir)/$(PACKAGE).pot: $(POTFILES)
|
||||
@ -90,8 +90,8 @@ $(srcdir)/$(PACKAGE).pot: $(POTFILES)
|
||||
|| ( rm -f $(srcdir)/$(PACKAGE).pot \
|
||||
&& mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot )
|
||||
|
||||
$(srcdir)/cat-id-tbl.c: stamp-cat-id; @:
|
||||
$(srcdir)/stamp-cat-id: $(PACKAGE).pot
|
||||
$(srcdir)/cat-id-tbl.c: $(srcdir)/stamp-cat-id; @:
|
||||
$(srcdir)/stamp-cat-id: $(srcdir)/$(PACKAGE).pot
|
||||
rm -f cat-id-tbl.tmp
|
||||
sed -f ../intl/po2tbl.sed $(srcdir)/$(PACKAGE).pot \
|
||||
| sed -e "s/@PACKAGE NAME@/$(PACKAGE)/" > cat-id-tbl.tmp
|
||||
@ -180,7 +180,8 @@ uninstall:
|
||||
|
||||
check: all
|
||||
|
||||
cat-id-tbl.o: ../intl/libgettext.h
|
||||
cat-id-tbl.o: $(srcdir)/cat-id-tbl.c $(top_srcdir)/intl/libgettext.h
|
||||
$(COMPILE) $(srcdir)/cat-id-tbl.c
|
||||
|
||||
dvi info tags TAGS ID:
|
||||
|
||||
@ -196,7 +197,7 @@ distclean: clean
|
||||
maintainer-clean: distclean
|
||||
@echo "This command is intended for maintainers to use;"
|
||||
@echo "it deletes files that may require special tools to rebuild."
|
||||
rm -f $(GMOFILES)
|
||||
rm -f $(GMOFILES) cat-id-tbl.c stamp-cat-id
|
||||
|
||||
distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
|
||||
dist distdir: update-po $(DISTFILES)
|
||||
@ -207,7 +208,7 @@ dist distdir: update-po $(DISTFILES)
|
||||
done
|
||||
|
||||
update-po: Makefile
|
||||
$(MAKE) $(PACKAGE).pot
|
||||
$(MAKE) $(srcdir)/$(PACKAGE).pot
|
||||
PATH=`pwd`/../src:$$PATH; \
|
||||
cd $(srcdir); \
|
||||
catalogs='$(CATALOGS)'; \
|
||||
|
||||
@ -4,8 +4,8 @@ EXTRA_DIST = lspgpot mail-signed-keys ring-a-party
|
||||
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl
|
||||
# we need to add libutil.la a second time because we have to resolve
|
||||
# gpg_log_ in some libjnlib modules. - very ugly - should be removed soon.
|
||||
needed_libs = ../util/libutil.la ../gcrypt/libgcrypt.la \
|
||||
../jnlib/libjnlib.la ../util/libutil.la @INTLLIBS@
|
||||
needed_libs = ../util/libutil.a -lgcrypt \
|
||||
../jnlib/libjnlib.a ../util/libutil.a @INTLLIBS@
|
||||
|
||||
|
||||
noinst_PROGRAMS = mpicalc bftest clean-sat mk-tdata shmtest
|
||||
|
||||
@ -3,10 +3,9 @@
|
||||
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl
|
||||
EXTRA_DIST = README
|
||||
|
||||
noinst_LTLIBRARIES = libutil.la
|
||||
noinst_LIBRARIES = libutil.a
|
||||
|
||||
libutil_la_LDFLAGS =
|
||||
libutil_la_SOURCES = logger.c fileutil.c miscutil.c strgutil.c \
|
||||
libutil_a_SOURCES = logger.c fileutil.c miscutil.c strgutil.c \
|
||||
ttyio.c errors.c iobuf.c \
|
||||
http.c simple-gettext.c w32reg.c
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user