summaryrefslogtreecommitdiff
path: root/net/ntop/patches/patch-ab
blob: 07add5a68cec8be6424bbba3e7ce09a47966d18b (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
$NetBSD: patch-ab,v 1.11 2005/11/18 13:03:53 rillig Exp $

The "gcc -o /dev/null" led to /dev/null be unlinked on Solaris.

This patch does not affect the build and is only intended to be reported
upstream.

--- configure.in.orig	Thu Oct 20 22:07:37 2005
+++ configure.in	Fri Nov 18 13:56:53 2005
@@ -715,8 +715,8 @@ AC_ARG_ENABLE(i18n,
 
 AC_ARG_ENABLE(jumbo-frames,
               [  --enable-jumbo-frames       Enable Jumbo (9K) Ethernet frames [[default=disabled]]],
-              ac_enable_jumbo-frames="yes",
-              ac_enable_jumbo-frames="no")
+              ac_enable_jumbo_frames="yes",
+              ac_enable_jumbo_frames="no")
 
 AC_ARG_ENABLE(ipv6,
               [  --disable-ipv6              use IPv6 [[default=enabled]]],
@@ -1988,16 +1988,12 @@ AC_CHECK_FUNCS([uname])
 dnl> Test for strtok_r (we have our own defn if it's not available)C_CHECK_FUNCS([strtok_r])
 AC_CHECK_FUNCS([strtok_r])
 
-case "${CC}" in
-  *gcc* )
     dnl> Check if malloc.h has mallinfo...
     AC_MSG_CHECKING([for mallinfo in malloc.h])
     AC_LANG_CONFTEST(
     [AC_LANG_PROGRAM([[#include <malloc.h>]],
                      [[struct mallinfo memStats = mallinfo();]])])
-    gcc conftest.c -o /dev/null > /dev/null 2> /dev/null
-    rc=$?
-    if test ".${rc}" = ".0"; then
+    if (eval "$ac_link"); then
         AC_MSG_RESULT(yes)
         AC_DEFINE_UNQUOTED(HAVE_MALLINFO_MALLOC_H,
                                1,
@@ -2005,7 +2001,6 @@ case "${CC}" in
     else
         AC_MSG_RESULT(no)
     fi
-esac
 
 NTOPCONFIGDEBUG_SETTINGS([After all tests])