See ChangeLog: Sat Feb 13 12:14:42 CET 1999 Werner Koch

9 files changed, 38 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 526f33eb..3e99e5cd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb 13 12:04:43 CET 1999  Werner Koch  <wk@isil.d.shuttle.de>
+
+	* configure.in: Changed detection of compiler flags.
+	* intl/ : Removed directory
+
 Wed Feb 10 17:15:39 CET 1999  Werner Koch  <wk@isil.d.shuttle.de>
 
 	* acinclude.m4 (GNUPG_CHECK_RDYNAMIC): Fix for freebsd 2.2
diff --git a/Makefile.am b/Makefile.am
index a12267d1..d5bbd0a6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS =  intl po zlib util mpi cipher tools g10 doc checks
+SUBDIRS = intl zlib util mpi cipher tools g10 po doc checks
 EXTRA_DIST = VERSION  PROJECTS
 
 all-am: g10defs.h
diff --git a/THANKS b/THANKS
index e880ad22..52df027d 100644
--- a/THANKS
+++ b/THANKS
@@ -63,6 +63,7 @@ Paul D. Smith		psmith@baynetworks.com
 Peter Gutmann		pgut001@cs.auckland.ac.nz
 QingLong		qinglong@bolizm.ihep.su
 Ralph Gillen		gillen@theochem.uni-duesseldorf.de
+Reinhard Wobst		R.Wobst@ifw-dresden.de
 Reuben Sumner		rasumner@wisdom.weizmann.ac.il
 Roddy Strachan		roddy@satlink.com.au
 Roland Rosenfeld	roland@spinnaker.rhein.de
diff --git a/acinclude.m4 b/acinclude.m4
index 42c4ffb3..496624c8 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -200,13 +200,14 @@ define(GNUPG_CHECK_RDYNAMIC,
         AC_MSG_RESULT(assume none)
     else
         case "$host_os" in
-          solaris*)
+          solaris* )
             CFLAGS_RDYNAMIC="-Wl,-dy"
             ;;
-          freebsd2*)
+
+          freebsd2* | osf4* )
             CFLAGS_RDYNAMIC=""
             ;;
-          *)
+          * )
             CFLAGS_RDYNAMIC="-Wl,-export-dynamic"
             ;;
         esac
diff --git a/configure.in b/configure.in
index 6ea0a81a..0bd463e5 100644
--- a/configure.in
+++ b/configure.in
@@ -59,9 +59,6 @@ else
 fi
 if test "$use_m_guard" = yes ; then
     AC_DEFINE(M_GUARD)
-    CFLAGS="$CFLAGS -g"
-else
-    CFLAGS="$CFLAGS -O2"
 fi
 
 
@@ -91,10 +88,18 @@ AC_PROG_INSTALL
 dnl AC_CYGWIN32
 
 
+MPI_OPT_FLAGS=""
 if test "$GCC" = yes; then
     CFLAGS="$CFLAGS -Wall"
+    dnl Always enable optimazation in MPI
+    if echo "$CFLAGS" | grep "-O" >/dev/null ; then
+        :
+    else
+        MPI_OPT_FLAGS=-O2
+    fi
 fi
 
+
 try_gettext=yes
 try_gdbm=yes
 case "${target}" in
@@ -130,6 +135,7 @@ case "${target}" in
        ;;
 esac
 
+AC_SUBST(MPI_OPT_FLAGS)
 
 GNUPG_CHECK_PIC
 GNUPG_CHECK_RDYNAMIC
@@ -169,6 +175,7 @@ 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.
diff --git a/mpi/ChangeLog b/mpi/ChangeLog
index 2a49d403..24d1defc 100644
--- a/mpi/ChangeLog
+++ b/mpi/ChangeLog
@@ -1,3 +1,7 @@
+Sat Feb 13 12:04:43 CET 1999  Werner Koch  <wk@isil.d.shuttle.de>
+
+	* Makefile.am: Removed the +=. Add MPI_OPT_FLAGS.
+
 Sat Jan  9 16:02:23 CET 1999  Werner Koch  <wk@isil.d.shuttle.de>
 
 	* mpi-cmp.c (mpi_cmp_ui): Normalized the arg.
diff --git a/mpi/Makefile.am b/mpi/Makefile.am
index 8a302888..6fb7adda 100644
--- a/mpi/Makefile.am
+++ b/mpi/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 INCLUDES =  -I$(top_srcdir)/include
-CFLAGS += -O2
+CFLAGS = @CFLAGS@ @MPI_OPT_FLAGS@
 SFLAGS = @MPI_SFLAGS@
 
 SUFFIXES = .S .s
diff --git a/scripts/ChangeLog b/scripts/ChangeLog
index a2b6e901..c14ea729 100644
--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,7 @@
+Sat Feb 13 12:04:43 CET 1999  Werner Koch  <wk@isil.d.shuttle.de>
+
+	* autogen.sh: Now uses gettextize
+
 Wed Feb 10 17:15:39 CET 1999  Werner Koch  <wk@isil.d.shuttle.de>
 
 	* config.sub, config.guess: Support i386-emx-os2
diff --git a/scripts/autogen.sh b/scripts/autogen.sh
index 813786c7..c49e8137 100755
--- a/scripts/autogen.sh
+++ b/scripts/autogen.sh
@@ -46,17 +46,22 @@ if (gettext --version </dev/null 2>/dev/null | awk 'NR==1 { split($4,A,"\."); \
 fi
 
 
-
 if test "$DIE" = "yes"; then
     exit 1
 fi
 
+echo "Running gettextize...  Ignore non-fatal messages."
+echo "no" | gettextize --force 
+
 
+echo "Running aclocal..."
 aclocal
+echo "Running autoheader..."
 autoheader
+echo "Running automake --gnu ..."
 automake --gnu;
-autoheader
+echo "Running autoconf..."
 autoconf
 
-echo "Ready to run ./configure"
+echo "You can now run \"./configure\" and then \"make\"."