Fix build with GCC 3.3.1: don't hunt for libm with log() but with floor().

While here set TEST_TARGET even if the submake all target includes the
test ones.

4 files changed, 99 insertions, 2 deletions

diff --git a/lang/mawk/Makefile b/lang/mawk/Makefile
index f95d048e637..ab266db5d12 100644
--- a/lang/mawk/Makefile
+++ b/lang/mawk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/09/05 19:00:59 tron Exp $
+# $NetBSD: Makefile,v 1.12 2003/09/30 21:47:14 seb Exp $
 #
 
 DISTNAME=       mawk-1.3.3
@@ -10,6 +10,7 @@ MAINTAINER=	agc@NetBSD.org
 COMMENT=	Mike Brennan's fast awk clone
 
 GNU_CONFIGURE=	yes
+TEST_TARGET=	mawk_test fpe_test
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/lang/mawk/distinfo b/lang/mawk/distinfo
index 52c9fe110d5..94a725cbb3e 100644
--- a/lang/mawk/distinfo
+++ b/lang/mawk/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.4 2003/03/15 16:57:22 wiz Exp $
+$NetBSD: distinfo,v 1.5 2003/09/30 21:47:14 seb Exp $
 
 SHA1 (mawk-1.3.3.tar.gz) = 314bcdb6543733f47ef4d9d9356b23f53d6a7f89
 Size (mawk-1.3.3.tar.gz) = 209942 bytes
 SHA1 (patch-aa) = 49ef8e8f9d5392c47933eadba87aceae1079d89b
 SHA1 (patch-ab) = b8faa90c98fac027b295336936a8e43c7087d972
+SHA1 (patch-ac) = e6671c71b7fdc2c8ccc0866e530c38057a80d48f
+SHA1 (patch-ad) = f74b16d155d3486e55b37485fe5d5c40ce5a4b56
diff --git a/lang/mawk/patches/patch-ac b/lang/mawk/patches/patch-ac
new file mode 100644
index 00000000000..89c2bcdd081
--- /dev/null
+++ b/lang/mawk/patches/patch-ac
@@ -0,0 +1,18 @@
+$NetBSD: patch-ac,v 1.1 2003/09/30 21:47:14 seb Exp $
+
+--- mawk.ac.m4.orig	1996-09-04 23:40:34.000000000 +0000
++++ mawk.ac.m4
+@@ -46,10 +46,10 @@ define(MIKE, brennan@whidbey.com)
+ dnl
+ define(LOOK_FOR_MATH_LIBRARY,[
+ if test "${MATHLIB+set}" != set  ; then
+-AC_CHECK_LIB(m,log,[MATHLIB=-lm ; LIBS="$LIBS -lm"],
++AC_CHECK_LIB(m,floor,[MATHLIB=-lm ; LIBS="$LIBS -lm"],
+ [# maybe don't need separate math library
+-AC_CHECK_FUNC(log, log=yes)
+-if test "$log$" = yes
++AC_CHECK_FUNC(floor, floor=yes)
++if test "$floor$" = yes
+ then
+    MATHLIB='' # evidently don't need one
+ else
diff --git a/lang/mawk/patches/patch-ad b/lang/mawk/patches/patch-ad
new file mode 100644
index 00000000000..5518542c966
--- /dev/null
+++ b/lang/mawk/patches/patch-ad
@@ -0,0 +1,76 @@
+$NetBSD: patch-ad,v 1.1 2003/09/30 21:47:14 seb Exp $
+
+--- configure.orig	1996-09-04 23:43:01.000000000 +0000
++++ configure
+@@ -529,7 +529,7 @@ cat > conftest.$ac_ext <<EOF
+ 
+ int main() { return 0; }
+ int t() {
+-log()
++floor()
+ ; return 0; }
+ EOF
+ if eval $ac_link; then
+@@ -549,18 +549,18 @@ if eval "test \"`echo '$ac_cv_lib_'m`\" 
+ else
+   echo "$ac_t""no" 1>&6
+ # maybe don't need separate math library
+-echo $ac_n "checking for log""... $ac_c" 1>&6
+-if eval "test \"`echo '$''{'ac_cv_func_log'+set}'`\" = set"; then
++echo $ac_n "checking for floor""... $ac_c" 1>&6
++if eval "test \"`echo '$''{'ac_cv_func_floor'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+ #line 558 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char log(); below.  */
++    which can conflict with char floor(); below.  */
+ #include <assert.h>
+ /* Override any gcc2 internal prototype to avoid an error.  */
+-char log(); 
++char floor(); 
+ 
+ int main() { return 0; }
+ int t() {
+@@ -568,32 +568,32 @@ int t() {
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_log) || defined (__stub___log)
++#if defined (__stub_floor) || defined (__stub___floor)
+ choke me
+ #else
+-log();
++floor();
+ #endif
+ 
+ ; return 0; }
+ EOF
+ if eval $ac_link; then
+   rm -rf conftest*
+-  eval "ac_cv_func_log=yes"
++  eval "ac_cv_func_floor=yes"
+ else
+   rm -rf conftest*
+-  eval "ac_cv_func_log=no"
++  eval "ac_cv_func_floor=no"
+ fi
+ rm -f conftest*
+ 
+ fi
+-if eval "test \"`echo '$ac_cv_func_'log`\" = yes"; then
++if eval "test \"`echo '$ac_cv_func_'floor`\" = yes"; then
+   echo "$ac_t""yes" 1>&6
+-  log=yes
++  floor=yes
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+-if test "$log$" = yes
++if test "$floor$" = yes
+ then
+    MATHLIB='' # evidently don't need one
+ else