* configure.ac: Test for ranlib and ar.

* Makefile.am: Make use of AM_CFLAGS and AM_LDFLAGS.

5 files changed, 33 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index a0c2b3198..713a900fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2003-03-24  Werner Koch  <[email protected]>
+
+	* configure.ac: Test for ranlib and ar.
+
+2003-03-12  Werner Koch  <[email protected]>
+
+	* acinclude.m4 (GNUPG_CHECK_ENDIAN): When crosscompiling assume
+	little only for Intel CPUs.
+
 2003-02-19  David Shaw  <[email protected]>
 
 	* configure.ac: Define @CAPLIBS@ to link in -lcap if we are using
@@ -1133,7 +1142,7 @@ Fri Feb 13 19:43:41 1998  Werner Koch  ([email protected])
 	* Makefile.am: Likewise
 
 
- Copyright 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+ Copyright 1998,1999,2000,2001,2002,2003 Free Software Foundation, Inc.
 
  This file is free software; as a special exception the author gives
  unlimited permission to copy and/or distribute it, with or without
diff --git a/acinclude.m4 b/acinclude.m4
index 63704e4e4..558b5a96e 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -111,8 +111,17 @@ dnl GNUPG_CHECK_ENDIAN
 dnl define either LITTLE_ENDIAN_HOST or BIG_ENDIAN_HOST
 dnl
 define(GNUPG_CHECK_ENDIAN,
-  [ if test "$cross_compiling" = yes; then
-        AC_MSG_WARN(cross compiling; assuming little endianess)
+  [
+    tmp_assumed_endian=big
+    if test "$cross_compiling" = yes; then
+      case "$host_cpu" in
+         i[345678]* )
+            tmp_assumed_endian=little
+            ;;
+         *)
+            ;;
+      esac
+      AC_MSG_WARN(cross compiling; assuming $tmp_assumed_endian endianess)
     fi
     AC_MSG_CHECKING(endianess)
     AC_CACHE_VAL(gnupg_cv_c_endian,
@@ -141,7 +150,7 @@ define(GNUPG_CHECK_ENDIAN,
               }],
               gnupg_cv_c_endian=little,
               gnupg_cv_c_endian=big,
-              gnupg_cv_c_endian=little
+              gnupg_cv_c_endian=$tmp_assumed_endian
             )
         fi
       ])
diff --git a/configure.ac b/configure.ac
index 9b0d1b8d2..dd5c2e156 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,6 @@
 dnl Configure.ac script for GnuPG
-dnl Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+dnl Copyright (C) 1998,1999,2000,2001,2002,
+dnl               2003 Free Software Foundation, Inc.
 dnl
 dnl This file is part of GnuPG.
 dnl
@@ -283,6 +284,8 @@ AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
 AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
 AC_PROG_CC
 AC_PROG_CPP
+AC_PROG_RANLIB
+AC_CHECK_TOOL(AR, ar, :)
 AC_PATH_PROG(PERL,"perl")
 AC_ISC_POSIX
 AC_SYS_LARGEFILE
@@ -466,6 +469,7 @@ dnl let that after linux to avoid gnu-linux problems
         ;;
     *)
         PRINTABLE_OS_NAME=`uname -s || echo "Unknown"`
+        test "$PRINTABLE_OS_NAME" = "Linux" && PRINTABLE_OS_NAME="GNU/Linux"
         ;;
 esac
 AC_DEFINE_UNQUOTED(PRINTABLE_OS_NAME, "$PRINTABLE_OS_NAME",
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 5fa1bcbc7..5526cb182 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,7 @@
+2003-03-24  Werner Koch  <[email protected]>
+
+	* Makefile.am: Make use of AM_CFLAGS and AM_LDFLAGS.
+
 2003-03-21  David Shaw  <[email protected]>
 
 	* status.c (do_get_from_fd): Accept 'y' as well as 'Y' for
diff --git a/g10/Makefile.am b/g10/Makefile.am
index dba2718b4..75f0010e0 100644
--- a/g10/Makefile.am
+++ b/g10/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1998,1999,2000,2001,2002,2003 Free Software Foundation, Inc.
 #
 # This file is part of GnuPG.
 #
@@ -22,9 +22,8 @@ INCLUDES = -I.. -I$(top_srcdir)/include -I$(top_srcdir)/intl
 EXTRA_DIST = options.skel
 # it seems that we can't use this with automake 1.5
 #OMIT_DEPENDENCIES = zlib.h zconf.h
-LDFLAGS = @LDFLAGS@
 libexecdir = @libexecdir@/@PACKAGE@
-CFLAGS = @CFLAGS@ -DGNUPG_LIBEXECDIR="\"$(libexecdir)\""
+AM_CFLAGS =  -DGNUPG_LIBEXECDIR="\"$(libexecdir)\""
 needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a @CAPLIBS@
 
 #noinst_PROGRAMS = gpgd