Revert "In get_unicode_or_ascii_string(), check if the length is odd/even, not the...

[metze/wireshark/wip.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index beecdbfcd72da60a95552a61580a65908d9d7b5d..3843403a4ab00cab85c53201e37668a54010bb5d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -750,11 +750,17 @@ fi
 AC_SUBST(HAVE_OSX_PACKAGING)
 
 #
-# Some compilers have to be told to fail on unknown warning errors;
+# Some compilers have to be told to fail when passed an unknown -W flag;
 # make sure we do that.
 #
 AC_WIRESHARK_CHECK_UNKNOWN_WARNING_OPTION_ERROR
 
+#
+# Some C++ compilers have to be told to fail when passed a -W flag that
+# they don't think should apply to C++; make sure we do that.
+#
+AC_WIRESHARK_CHECK_NON_CXX_WARNING_OPTION_ERROR
+
 #
 # Try to add some additional gcc checks to CFLAGS
 #
@@ -829,7 +835,6 @@ AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wstrict-prototypes, C)
 AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wjump-misses-init, C)
 AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wvla)
 AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Waddress)
-AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Warray-bounds)
 AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wattributes)
 AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wdiv-by-zero)
 AC_WIRESHARK_COMPILER_FLAGS_CHECK(-Wignored-qualifiers)
@@ -911,9 +916,9 @@ esac
 #
 AC_WIRESHARK_COMPILER_FLAGS_CHECK(-fexcess-precision=fast)
 
-CFLAGS_before_fvhidden=$CFLAGS
+CFLAGS_before_fvhidden="$CFLAGS"
 AC_WIRESHARK_COMPILER_FLAGS_CHECK(-fvisibility=hidden)
-if test "x$CLFAGS" = "x$CFLAGS_before_fvhidden"
+if test "x$CFLAGS" = "x$CFLAGS_before_fvhidden"
 then
        # TODO add other ways of hiding symbols
        AC_MSG_WARN(Compiler will export all symbols from shared libraries)
@@ -932,14 +937,14 @@ AC_WIRESHARK_LDFLAGS_CHECK([-Wl,--as-needed])
 # privileges, and using PIE means the OS can run it at random locations
 # in the address space to make attacks more difficult.
 #
-CFLAGS_before_pie=$CFLAGS
+CFLAGS_before_pie="$CFLAGS"
 AC_WIRESHARK_COMPILER_FLAGS_CHECK(-fPIE)
-if test "x$CLFAGS" != "x$CFLAGS_before_pie"
+if test "x$CFLAGS" != "x$CFLAGS_before_pie"
 then
        # Restore CFLAGS
-       CFLAGS=$CFLAGS_before_pie
+       CFLAGS="$CFLAGS_before_pie"
 
-       LDFLAGS_before_pie=$LDFLAGS
+       LDFLAGS_before_pie="$LDFLAGS"
        AC_WIRESHARK_LDFLAGS_CHECK([-fPIE -pie])
        if test "x$LDFLAGS" != "x$LDFLAGS_before_pie"
        then
@@ -948,7 +953,7 @@ then
                PIE_LDFLAGS="-pie"
 
                # Restore LDFLAGS
-               LDFLAGS=$LDFLAGS_before_pie
+               LDFLAGS="$LDFLAGS_before_pie"
        fi
 
 fi
@@ -1490,7 +1495,13 @@ if test "$have_gtk" = "yes" ; then
 
        CPPFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED $CPPFLAGS"
        CPPFLAGS="-DGDK_DISABLE_DEPRECATED $CPPFLAGS"
-       CPPFLAGS="-DGTK_DISABLE_DEPRECATED $CPPFLAGS"
+       if test \( $gtk_config_major_version -eq 3 -a $gtk_config_minor_version -ge 10 \) ; then
+               ## Allow use of deprecated & disable deprecated warnings if Gtk >= 3.10;
+               ##  The deprecations in Gtk 3.10 will not be fixed ...
+               CPPFLAGS="-DGDK_DISABLE_DEPRECATION_WARNINGS $CPPFLAGS"
+       else
+               CPPFLAGS="-DGTK_DISABLE_DEPRECATED $CPPFLAGS"
+       fi
        CPPFLAGS="-DGTK_DISABLE_SINGLE_INCLUDES $CPPFLAGS"
        if test ! \( $gtk_config_major_version -eq 2 -a $gtk_config_minor_version -lt 20 \) ; then
                # Enable GSEAL when building with GTK > 2.20
@@ -1737,9 +1748,23 @@ else
 fi
 AC_SUBST(tshark_bin)
 AC_SUBST(tshark_man)
-AC_SUBST(wiresharkfilter_man)
 
+# Enable/disable tfshark
+AC_ARG_ENABLE(tfshark,
+  AC_HELP_STRING( [--enable-tfshark],
+                  [build TFShark @<:@default=no@:>@]),
+    tfshark=$enableval,enable_tfshark=no)
 
+if test "x$enable_tfshark" = "xyes" ; then
+       tfshark_bin="tfshark\$(EXEEXT)"
+       tfshark_man="tfshark.1"
+       wiresharkfilter_man="wireshark-filter.4"
+else
+       tfshark_bin=""
+       tfshark_man=""
+fi
+AC_SUBST(tfshark_bin)
+AC_SUBST(tfshark_man)
 
 # Enable/disable editcap
 
@@ -1758,8 +1783,6 @@ fi
 AC_SUBST(editcap_bin)
 AC_SUBST(editcap_man)
 
-
-
 # Enable/disable echld
 
 AC_ARG_ENABLE(echld,
@@ -1781,7 +1804,6 @@ fi
 AC_SUBST(echld_test_bin)
 AC_SUBST(echld_dir)
 
-
 # Enabling/disabling of dumpcap is done later (after we know if we have PCAP
 # or not)
 
@@ -1802,7 +1824,6 @@ fi
 AC_SUBST(capinfos_bin)
 AC_SUBST(capinfos_man)
 
-
 # Enable/disable captype
 
 AC_ARG_ENABLE(captype,
@@ -1820,7 +1841,6 @@ fi
 AC_SUBST(captype_bin)
 AC_SUBST(captype_man)
 
-
 # Enable/disable mergecap
 
 AC_ARG_ENABLE(mergecap,
@@ -1838,7 +1858,6 @@ fi
 AC_SUBST(mergecap_bin)
 AC_SUBST(mergecap_man)
 
-
 # Enable/disable reordercap
 
 AC_ARG_ENABLE(reordercap,
@@ -1856,7 +1875,6 @@ fi
 AC_SUBST(reordercap_bin)
 AC_SUBST(reordercap_man)
 
-
 # Enable/disable text2pcap
 
 AC_ARG_ENABLE(text2pcap,
@@ -1874,7 +1892,6 @@ fi
 AC_SUBST(text2pcap_bin)
 AC_SUBST(text2pcap_man)
 
-
 # Enable/disable dftest
 
 AC_ARG_ENABLE(dftest,
@@ -1892,7 +1909,6 @@ fi
 AC_SUBST(dftest_bin)
 AC_SUBST(dftest_man)
 
-
 # Enable/disable randpkt
 
 AC_ARG_ENABLE(randpkt,
@@ -1910,7 +1926,7 @@ fi
 AC_SUBST(randpkt_bin)
 AC_SUBST(randpkt_man)
 
-
+AC_SUBST(wiresharkfilter_man)
 
 dnl Checks for "gethostbyname()" - and "-lnsl", if we need it to get
 dnl "gethostbyname()".
@@ -2754,7 +2770,6 @@ AC_OUTPUT(
   asn1/dsp/Makefile
   asn1/ess/Makefile
   asn1/ftam/Makefile
-  asn1/gnm/Makefile
   asn1/goose/Makefile
   asn1/gprscdr/Makefile
   asn1/gsm_map/Makefile
@@ -2789,6 +2804,7 @@ AC_OUTPUT(
   asn1/mpeg-pes/Makefile
   asn1/nbap/Makefile
   asn1/ns_cert_exts/Makefile
+  asn1/novell_pkis/Makefile
   asn1/ocsp/Makefile
   asn1/p1/Makefile
   asn1/p22/Makefile
@@ -2848,6 +2864,7 @@ AC_OUTPUT(
   epan/wmem/Makefile
   epan/wslua/Makefile
   epan/wspython/Makefile
+  filetap/Makefile
   codecs/Makefile
   ui/Makefile
   ui/doxygen.cfg
@@ -2870,7 +2887,6 @@ AC_OUTPUT(
   packaging/svr4/checkinstall
   packaging/svr4/pkginfo
   plugins/Makefile
-  plugins/asn1/Makefile
   plugins/docsis/Makefile
   plugins/ethercat/Makefile
   plugins/gryphon/Makefile
@@ -3002,6 +3018,7 @@ echo "The Wireshark package has been configured with the following options."
 echo "             Build wireshark (Gtk+) : $have_gtk""$gtk_lib_message"
 echo "                 Build wireshark-qt : $enable_qtshark"
 echo "                       Build tshark : $enable_tshark"
+echo "                      Build tfshark : $enable_tfshark"
 echo "                     Build capinfos : $enable_capinfos"
 echo "                      Build captype : $enable_captype"
 echo "                      Build editcap : $enable_editcap"