summaryrefslogtreecommitdiff
path: root/acinclude.m4
diff options
context:
space:
mode:
authorJörg Mayer <jmayer@loplof.de>2003-01-21 21:47:36 +0000
committerJörg Mayer <jmayer@loplof.de>2003-01-21 21:47:36 +0000
commit106bedb847a7beca5209f822ecc21b8ad909d7fd (patch)
treed2f4c30ec96f9ff206fa2256b21150786b4ed4f7 /acinclude.m4
parent8adf7a08fd843c0160a7efd37ec8e1d2c9f678db (diff)
downloadwireshark-106bedb847a7beca5209f822ecc21b8ad909d7fd.tar.gz
cjs 2895: Fix configure check to compile with IBM Visual Age C compiler
- remove nested functions - use char *pcap_version instead of char pcap_version[] Changed the fix for the nested functions to use the mechanisms provided by autoconf. svn path=/trunk/; revision=6963
Diffstat (limited to 'acinclude.m4')
-rw-r--r--acinclude.m416
1 files changed, 7 insertions, 9 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 24a03bb48e..9ec89ec92a 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2,7 +2,7 @@ dnl Macros that test for specific features.
dnl This file is part of the Autoconf packaging for Ethereal.
dnl Copyright (C) 1998-2000 by Gerald Combs.
dnl
-dnl $Id: acinclude.m4,v 1.48 2003/01/21 20:38:30 jmayer Exp $
+dnl $Id: acinclude.m4,v 1.49 2003/01/21 21:47:07 jmayer Exp $
dnl
dnl This program is free software; you can redistribute it and/or modify
dnl it under the terms of the GNU General Public License as published by
@@ -339,15 +339,13 @@ AC_DEFUN(AC_ETHEREAL_PCAP_VERSION_CHECK,
AC_MSG_CHECKING(whether pcap_version is defined by libpcap)
ac_save_LIBS="$LIBS"
LIBS="$PCAP_LIBS $SOCKET_LIBS $NSL_LIBS $LIBS"
- AC_TRY_LINK([],
+ AC_TRY_LINK(
[
-char *
-return_pcap_version(void)
-{
- extern char pcap_version[];
-
- return pcap_version;
-}
+# include <stdio.h>
+ extern char *pcap_version;
+ ],
+ [
+ printf ("%s\n", pcap_version);
],
ac_cv_pcap_version_defined=yes,
ac_cv_pcap_version_defined=no,