summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog14
-rw-r--r--README5
-rw-r--r--THANKS1
-rw-r--r--configure.ac41
4 files changed, 36 insertions, 25 deletions
diff --git a/ChangeLog b/ChangeLog
index 5c79b495..d602a3d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,17 @@
+2005-06-10 Werner Koch <wk@g10code.com>
+
+ * configure.ac: Move detection of basic stuff to the top. For
+ example we need to know whether gcc is used before testing for it.
+ Reported by Ralf Fassel.
+
2005-04-23 Moritz Schulte <moritz@g10code.com>
* 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` nstead.
- 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 in
+ backticks instead. Simpler -lnsl/-lsocket test. Use
+ TYPE_SOCKLEN_T test. Don't forget to set `random_modules'
+ correctly.
2005-04-22 Moritz Schulte <moritz@g10code.com>
diff --git a/README b/README
index 9eba285e..e435b6a0 100644
--- a/README
+++ b/README
@@ -55,8 +55,7 @@
rndunix - Entropy gatherer for Unices without a /dev/random
rndw32 - Entropy gatherer for MS Windows
- The documentation is available under the terms of the GNU Free
- Documentation License; see the file COPYING.DOC for the terms.
+ The documentation is available under the terms of the GPL.
This library used to be available under the GPL - this was changed
with version 1.1.7 with the rationale that there are now many free
@@ -64,7 +63,7 @@
similar to Libcrypt. We decided that to foster the use of
cryptography in Free Software an LGPLed library would make more
sense because it avoids problems due to license incompatibilities
- between some Free Software licenses and the GPL.
+ between some Free Software licenses and the GPL.
Please note that in many cases it is better for a library to be
licensed under the GPL, so that it provides an advantage for free
diff --git a/THANKS b/THANKS
index e0b63b5d..2441d05b 100644
--- a/THANKS
+++ b/THANKS
@@ -90,6 +90,7 @@ Philippe Laliberte arsphl@oeil.qc.ca
Peter Gutmann pgut001@cs.auckland.ac.nz
QingLong qinglong@bolizm.ihep.su
Rafael Ávila de Espíndola rafael.espindola@gmail.com
+Ralf Fassel ralf@akutech.de
Ralf Hildebrandt Ralf.Hildebrandt@innominate.com
Ralf Schneider ralf@tapfere-schneiderleins.de
Ralph Gillen gillen@theochem.uni-duesseldorf.de
diff --git a/configure.ac b/configure.ac
index 79bc7638..7c64893d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -70,6 +70,7 @@ AH_VERBATIM([_REENTRANT],
#endif
])
+
AC_SUBST(LIBGCRYPT_LT_CURRENT)
AC_SUBST(LIBGCRYPT_LT_AGE)
AC_SUBST(LIBGCRYPT_LT_REVISION)
@@ -78,6 +79,28 @@ AC_SUBST(VERSION)
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)
+######################
+
+AC_PROG_MAKE_SET
+missing_dir=`cd $ac_aux_dir && pwd`
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
+AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
+AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
+# AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
+AC_PROG_CC
+AC_PROG_CPP
+AM_PROG_AS
+AC_ISC_POSIX
+AC_PROG_INSTALL
+AC_PROG_AWK
+
+AM_PROG_LIBTOOL
+
+
##########################
## General definitions. ##
##########################
@@ -366,25 +389,7 @@ AC_ARG_WITH(capabilities,
[use_capabilities="$withval"],[use_capabilities=no])
AC_MSG_RESULT($use_capabilities)
-##############################
-#### Checks for programs. ####
-##############################
-AC_PROG_MAKE_SET
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-# AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_PROG_CC
-AC_PROG_CPP
-AM_PROG_AS
-AC_ISC_POSIX
-AC_PROG_INSTALL
-AC_PROG_AWK
-
-AM_PROG_LIBTOOL
AC_DEFINE_UNQUOTED(PRINTABLE_OS_NAME, "$PRINTABLE_OS_NAME",
[A human readable text with the name of the OS])