diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-08-03 11:48:44 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-08-03 18:49:17 +0000 |
| commit | 27cfea6467d26ef44f73d4fce70a2895b3b98bdb (patch) | |
| tree | 6abdb39cda60a7d12f7058651468ed681acaf402 /acinclude.m4 | |
| parent | 53957d846c6831e943b70db5ae79bc750bf7397f (diff) | |
| download | wireshark-27cfea6467d26ef44f73d4fce70a2895b3b98bdb.tar.gz wireshark-27cfea6467d26ef44f73d4fce70a2895b3b98bdb.tar.bz2 wireshark-27cfea6467d26ef44f73d4fce70a2895b3b98bdb.zip | |
Define INET6 in config.h rather than in the Makefile.
That's what we do with nmake and CMake; this makes it uniform, so it's
easier to compare compiler commands.
Change-Id: Ice2c4bd796e921fa3089e8a45a32ad14d9b0e0a4
Reviewed-on: https://code.wireshark.org/review/3387
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 52e5b967f9..93c0a3746e 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -170,6 +170,10 @@ yes #endif], [v6type=$i; v6lib=v6; v6libdir=/usr/local/v6/lib; + # + # XXX - this doesn't define INET6; + # is that a mistake? + # CPPFLAGS="-I/usr/local/v6/include $CPPFLAGS"]) ;; toshiba) @@ -180,7 +184,7 @@ yes #endif], [v6type=$i; v6lib=inet6; v6libdir=/usr/local/v6/lib; - CPPFLAGS="-DINET6 $CPPFLAGS"]) + AC_DEFINE(INET6, 1, [Define if the platform supports IPv6])]) ;; kame) AC_EGREP_CPP(yes, [ @@ -190,7 +194,7 @@ yes #endif], [v6type=$i; v6lib=inet6; v6libdir=/usr/local/v6/lib; - CPPFLAGS="-DINET6 $CPPFLAGS"]) + AC_DEFINE(INET6, 1, [Define if the platform supports IPv6])]) ;; inria) AC_EGREP_CPP(yes, [ @@ -198,7 +202,8 @@ yes #ifdef IPV6_INRIA_VERSION yes #endif], - [v6type=$i; CPPFLAGS="-DINET6 $CPPFLAGS"]) + [v6type=$i; + AC_DEFINE(INET6, 1, [Define if the platform supports IPv6])]) ;; zeta) AC_EGREP_CPP(yes, [ @@ -208,14 +213,14 @@ yes #endif], [v6type=$i; v6lib=inet6; v6libdir=/usr/local/v6/lib; - CPPFLAGS="-DINET6 $CPPFLAGS"]) + AC_DEFINE(INET6, 1, [Define if the platform supports IPv6])]) ;; linux) if test -d /usr/inet6; then v6type=$i v6lib=inet6 v6libdir=/usr/inet6 - CPPFLAGS="-DINET6 $CPPFLAGS" + AC_DEFINE(INET6, 1, [Define if the platform supports IPv6]) fi ;; linux-glibc) @@ -226,13 +231,18 @@ yes yes #endif #endif], - [v6type=$i; v6lib=inet6; CPPFLAGS="-DINET6 $CPPFLAGS"]) + [v6type=$i; v6lib=inet6; + AC_DEFINE(INET6, 1, [Define if the platform supports IPv6])]) ;; solaris) + # + # XXX - "SunOS" as opposed to what? SunOS 5 + # should always say "SunOS" here. + # if test "`uname -s`" = "SunOS"; then v6type=$i v6lib=inet6 - [CPPFLAGS="-DINET6 $CPPFLAGS"] + AC_DEFINE(INET6, 1, [Define if the platform supports IPv6]) fi ;; esac |