[svn] gcry - r1113 - branches/LIBGCRYPT-2.0-MO
svn author mo
cvs at cvs.gnupg.org
Sat Oct 1 22:38:02 CEST 2005
Author: mo
Date: 2005-10-01 22:38:02 +0200 (Sat, 01 Oct 2005)
New Revision: 1113
Modified:
branches/LIBGCRYPT-2.0-MO/ChangeLog
branches/LIBGCRYPT-2.0-MO/Makefile.am
branches/LIBGCRYPT-2.0-MO/configure.ac
Log:
2005-10-01 Moritz Schulte <moritz at g10code.com>
* Makefile.am: Adjust directory specifications to new source-tree
layout.
2005-09-21 Moritz Schulte <moritz at g10code.com>
* configure.ac: Check for threading libraries in order to allow
the test suite to enable threading.
Adjust paths for new source tree layout.
Bump version number up to 2.0.0-cvs.
Modified: branches/LIBGCRYPT-2.0-MO/ChangeLog
===================================================================
--- branches/LIBGCRYPT-2.0-MO/ChangeLog 2005-10-01 20:33:05 UTC (rev 1112)
+++ branches/LIBGCRYPT-2.0-MO/ChangeLog 2005-10-01 20:38:02 UTC (rev 1113)
@@ -1,3 +1,15 @@
+2005-10-01 Moritz Schulte <moritz at g10code.com>
+
+ * Makefile.am: Adjust directory specifications to new source-tree
+ layout.
+
+2005-09-21 Moritz Schulte <moritz at g10code.com>
+
+ * configure.ac: Check for threading libraries in order to allow
+ the test suite to enable threading.
+ Adjust paths for new source tree layout.
+ Bump version number up to 2.0.0-cvs.
+
2005-09-15 Moritz Schulte <moritz at g10code.com>
* Makefile.am (EXTRA_DIST): Depend on README.SVN, not on README.CVS.
@@ -16,10 +28,10 @@
* acinclude.m4 (TYPE_SOCKLEN_T): New type definition test;
provided by Albert Chin.
- * configure.ac: Don't use $(CMD) as it's not portable; use CMD in
- backticks instead. Simpler -lnsl/-lsocket test. Use
- TYPE_SOCKLEN_T test. Don't forget to set `random_modules'
- correctly.
+ * configure.ac: Don't use $(CMD) as it's not portable; use `CMD` nstead.
+ Simpler -lnsl/-lsocket test.
+ Use TYPE_SOCKLEN_T test.
+ Don't forget to set `random_modules' correctly.
2005-04-22 Moritz Schulte <moritz at g10code.com>
@@ -550,9 +562,9 @@
* acinclude.m4, configure.in (GNUPG_CHECK_GNUMAKE): New.
- * acinclude.m4 (MKDIR_TAKES_ONE_ARG): Check some headers. By Gaël Quéri.
+ * acinclude.m4 (MKDIR_TAKES_ONE_ARG): Check some headers. By Gaël Quéri.
- * configure.in (AM_INIT_AUTOMAKE): Use this now. By Gaël.
+ * configure.in (AM_INIT_AUTOMAKE): Use this now. By Gaël.
* acinclude.m4 (GNUPG_CHECK_EXPORTDYNAMIC): Replacement for
GNUPG_CHECK_RDYNAMIC which should handle gcc with non GNU ld nicer.
@@ -570,7 +582,7 @@
* configure.in (ALL_LINGUAS): Add sv and ja.
* configure.in: Use /usr/local for CFLAGS and LDFLAGS when
- target is freebsd. By Rémi.
+ target is freebsd. By Rémi.
* configure.in: Do not set development version when the version has
a dash in it. Suggested by Dave Dykstra.
@@ -608,7 +620,7 @@
Mon Jan 31 17:46:35 CET 2000 Werner Koch <wk@>
- * Makefile.am: Re-added tools. By Rémi.
+ * Makefile.am: Re-added tools. By Rémi.
Mon Jan 31 16:37:34 CET 2000 Werner Koch <wk at gnupg.de>
@@ -860,7 +872,7 @@
* config.links (m68k-atari-mint): New
-Tue Jan 12 09:17:19 CET 1999 Gaël Quéri <gqueri at mail.dotcom.fr>
+Tue Jan 12 09:17:19 CET 1999 Gaël Quéri <gqueri at mail.dotcom.fr>
* all: Fixed typos all over the place
Modified: branches/LIBGCRYPT-2.0-MO/Makefile.am
===================================================================
--- branches/LIBGCRYPT-2.0-MO/Makefile.am 2005-10-01 20:33:05 UTC (rev 1112)
+++ branches/LIBGCRYPT-2.0-MO/Makefile.am 2005-10-01 20:38:02 UTC (rev 1113)
@@ -1,28 +1,6 @@
-## Process this file with automake to produce Makefile.in
-# Copyright (C) 1992, 1999, 2000, 2002 Free Software Foundation, Inc.
-#
-# This file is part of Libgcrypt.
-#
-# Libgcrypt is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 2.1 of
-# the License, or (at your option) any later version.
-#
-# Libgcrypt is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-
-ACLOCAL_AMFLAGS = -I m4
-AUTOMAKE_OPTIONS = dist-bzip2
-
-DIST_SUBDIRS = mpi cipher src doc tests w32-dll
-SUBDIRS = mpi cipher src doc tests
-EXTRA_DIST = BUGS autogen.sh README.apichanges README.SVN
+DIST_SUBDIRS = src doc tests
+SUBDIRS = src doc tests
+EXTRA_DIST = BUGS autogen.sh DESIGN
DISTCLEANFILES =
@@ -32,7 +10,7 @@
dist-hook:
@set -e; \
for file in `cd $(top_srcdir); \
- find mpi -type f -name distfiles`; do \
+ find . -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 \
@@ -41,8 +19,3 @@
done
@set -e; \
echo "$(VERSION)" > $(distdir)/VERSION
-
-
-
-
-
Modified: branches/LIBGCRYPT-2.0-MO/configure.ac
===================================================================
--- branches/LIBGCRYPT-2.0-MO/configure.ac 2005-10-01 20:33:05 UTC (rev 1112)
+++ branches/LIBGCRYPT-2.0-MO/configure.ac 2005-10-01 20:38:02 UTC (rev 1113)
@@ -1,3 +1,4 @@
+
# Configure.ac script for Libgcrypt
# Copyright (C) 1998, 1999, 2000, 2001, 2002
# 2003, 2004 Free Software Foundation, Inc.
@@ -27,7 +28,7 @@
# but remove a "-cvs" prefix right *before* a release and append it
# soon later.
-AC_INIT(libgcrypt, 1.3.0-cvs, bug-libgcrypt at gnupg.org)
+AC_INIT(libgcrypt, 2.0.0-cvs2, bug-libgcrypt at gnupg.org)
# LT Version numbers, remember to change them just *before* a release.
# (Interfaces removed: CURRENT++, AGE=0, REVISION=0)
@@ -46,7 +47,8 @@
PACKAGE=$PACKAGE_NAME
VERSION=$PACKAGE_VERSION
-AC_CONFIG_SRCDIR([src/gcrypt.h])
+AC_CONFIG_SRCDIR([src/compat/gcrypt.h])
+AC_CONFIG_AUX_DIR([scripts])
AC_CANONICAL_TARGET()
AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
AM_CONFIG_HEADER(config.h)
@@ -70,7 +72,6 @@
#endif
])
-
AC_SUBST(LIBGCRYPT_LT_CURRENT)
AC_SUBST(LIBGCRYPT_LT_AGE)
AC_SUBST(LIBGCRYPT_LT_REVISION)
@@ -79,7 +80,6 @@
AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this package])
AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version of this package])
-
######################
## Basic checks. ### (we need some results later on (e.g. $GCC)
######################
@@ -100,7 +100,6 @@
AM_PROG_LIBTOOL
-
##########################
## General definitions. ##
##########################
@@ -389,8 +388,6 @@
[use_capabilities="$withval"],[use_capabilities=no])
AC_MSG_RESULT($use_capabilities)
-
-
AC_DEFINE_UNQUOTED(PRINTABLE_OS_NAME, "$PRINTABLE_OS_NAME",
[A human readable text with the name of the OS])
@@ -437,6 +434,20 @@
[AC_SEARCH_LIBS(setsockopt, [socket], , , [-lnsl])])
AC_SEARCH_LIBS(setsockopt, [nsl])
+# We check for threading libraries to allow the test suite to test
+# multi-threading.
+
+AC_CHECK_PTH(1.2.0,,,no,have_pth=yes)
+if test "$have_pth" = yes; then
+ AC_DEFINE(HAVE_PTH, ,[Define if we have Pth.])
+ CFLAGS="$CFLAGS $PTH_CFLAGS"
+fi
+
+AC_CHECK_LIB(pthread,pthread_create,have_pthread=yes)
+if test "$have_pthread" = yes; then
+ AC_DEFINE(HAVE_PTHREAD, ,[Define if we have pthread.])
+fi
+
##################################
#### Checks for header files. ####
##################################
@@ -563,8 +574,8 @@
#
GNUPG_SYS_SYMBOL_UNDERSCORE()
AC_MSG_CHECKING(for mpi assembler functions)
-if test -f $srcdir/mpi/config.links ; then
- . $srcdir/mpi/config.links
+if test -f $srcdir/src/subsystems/mpi/config.links ; then
+ . $srcdir/src/subsystems/mpi/config.links
AC_CONFIG_LINKS("$mpi_ln_list")
ac_cv_mpi_mod_list="$mpi_mod_list"
ac_cv_mpi_sflags="$mpi_sflags"
@@ -572,7 +583,7 @@
AC_MSG_RESULT(done)
else
AC_MSG_RESULT(failed)
- AC_MSG_ERROR([mpi/config.links missing!])
+ AC_MSG_ERROR([src/subsystems/mpi/config.links missing!])
fi
MPI_MOD_LIST_LO=""
MPI_MOD_LIST_O=""
@@ -628,7 +639,7 @@
# Make the version number in src/gcrypt.h the same as the one here.
# (this is easier than to have a *.in file just for one substitution)
#
-GNUPG_FIX_HDR_VERSION([src/gcrypt.h], GCRYPT_VERSION)
+GNUPG_FIX_HDR_VERSION([src/compat/gcrypt.h], GCRYPT_VERSION)
AC_SUBST(LIBGCRYPT_CONFIG_API_VERSION)
AC_SUBST(LIBGCRYPT_CONFIG_LIBS)
@@ -783,13 +794,29 @@
AC_CONFIG_FILES([
Makefile
-mpi/Makefile
-cipher/Makefile
-doc/Makefile
src/Makefile
+src/include/Makefile
+src/liberty/Makefile
+src/common/Makefile
+src/ath/Makefile
+src/compat/Makefile
+src/subsystems/Makefile
+src/subsystems/mpi/Makefile
+src/subsystems/sexp/Makefile
+src/subsystems/prime/Makefile
+src/subsystems/secmem/Makefile
+src/subsystems/random/Makefile
+src/subsystems/hash/Makefile
+src/subsystems/sym-cipher/Makefile
+src/subsystems/asym-cipher/Makefile
+src/modules/Makefile
+src/modules/hash/Makefile
+src/modules/sym-cipher/Makefile
+src/modules/asym-cipher/Makefile
+src/scripts/Makefile
src/libgcrypt-config
+doc/Makefile
tests/Makefile
-w32-dll/Makefile
])
AC_OUTPUT
More information about the Gnupg-commits
mailing list