diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2012-06-20 19:11:55 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2012-06-20 19:11:55 +0000 |
| commit | 41232f172ef1b7fb24181d0d03354de6a82a2519 (patch) | |
| tree | 8775a782379faa2fe829f9e385addc5651db084a | |
| parent | d9f88ebdcc4c6a76e1c4cd59cb96a4284870a95f (diff) | |
| download | wireshark-41232f172ef1b7fb24181d0d03354de6a82a2519.tar.gz | |
Remove HAVE_WIRELESS_TOOLBAR from the other build systems.
svn path=/trunk/; revision=43419
| -rw-r--r-- | Makefile.nmake | 1 | ||||
| -rw-r--r-- | config.h.win32 | 1 | ||||
| -rw-r--r-- | config.nmake | 1 | ||||
| -rw-r--r-- | configure.in | 4 |
4 files changed, 0 insertions, 7 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 52dd6bfa33..007f7d55ca 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -412,7 +412,6 @@ config.h : config.h.win32 config.nmake -e "s/@HAVE_LUA_5_1@/$(LUA_VERSION)/" \ -e "s/@HAVE_PYTHON@/$(PYTHON_CONFIG)/" \ -e "s/@HAVE_AIRPCAP@/$(AIRPCAP_CONFIG)/" \ - -e "s/@HAVE_WIRELESS_TOOLBAR@/$(WIRELESS_TOOLBAR_CONFIG)/" \ -e "s/@HAVE_AIRPDCAP@/$(AIRPDCAP_CONFIG)/" \ -e "s/@HAVE_LIBPORTAUDIO@/$(PORTAUDIO_CONFIG)/" \ -e "s/@PORTAUDIO_API_1@/$(PORTAUDIO_API_CONFIG)/" \ diff --git a/config.h.win32 b/config.h.win32 index 2b9c7fbecb..d66faeb8be 100644 --- a/config.h.win32 +++ b/config.h.win32 @@ -72,7 +72,6 @@ /* #undef HAVE_PCAP_GET_SELECTABLE_FD */ @HAVE_AIRPCAP@ -@HAVE_WIRELESS_TOOLBAR@ @PCAP_NG_DEFAULT@ @WANT_PACKET_EDITOR@ diff --git a/config.nmake b/config.nmake index 030bef4f05..6f32dc6cba 100644 --- a/config.nmake +++ b/config.nmake @@ -1132,7 +1132,6 @@ NEED_XML_DLL=USE !IFDEF AIRPCAP_DIR AIRPCAP_CONFIG=^#define HAVE_AIRPCAP 1 -WIRELESS_TOOLBAR_CONFIG=^#define HAVE_WIRELESS_TOOLBAR 1 #AIRPCAP_CFLAGS=/I$(AIRPCAP_DIR)\include !ELSE AIRPCAP_CONFIG= diff --git a/configure.in b/configure.in index 0bc39b6a66..a6724d1952 100644 --- a/configure.in +++ b/configure.in @@ -236,7 +236,6 @@ if (test "${have_libnl3}" = "yes"); then LIBS="$LIBS $LIBNL3_LIBS" AC_DEFINE(HAVE_LIBNL, 1, [Enable libnl support]) AC_DEFINE(HAVE_LIBNL3, 1, [libnl version 3]) - AC_DEFINE(HAVE_WIRELESS_TOOLBAR, 1, [Wireless Toolbar]) libnl_message="yes (v3)" enable_airpcap=no elif (test "${have_libnl2}" = "yes"); then @@ -244,14 +243,12 @@ elif (test "${have_libnl2}" = "yes"); then LIBS="$LIBS $LIBNL2_LIBS" AC_DEFINE(HAVE_LIBNL, 1, [Enable libnl support]) AC_DEFINE(HAVE_LIBNL2, 1, [libnl version 2]) - AC_DEFINE(HAVE_WIRELESS_TOOLBAR, 1, [Wireless Toolbar]) libnl_message="yes (v2)" enable_airpcap=no elif (test "${have_libnl1}" = "yes"); then CFLAGS="$CFLAGS $LIBNL1_CFLAGS" LIBS="$LIBS $LIBNL1_LIBS" AC_DEFINE(HAVE_LIBNL, 1, [Enable libnl support]) - AC_DEFINE(HAVE_WIRELESS_TOOLBAR, 1, [Wireless Toolbar]) libnl_message="yes (v1)" enable_airpcap=no fi @@ -1293,7 +1290,6 @@ if test x$enable_airpcap = xyes; then else AC_MSG_RESULT(yes) AC_DEFINE(HAVE_AIRPCAP, 1, [Enable AirPcap]) - AC_DEFINE(HAVE_WIRELESS_TOOLBAR, 1, [Wireless Toolbar]) fi else AC_MSG_RESULT(no) |