If we're linking with Qt pass a hint to automake that it needs to use c++

linking.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@46878 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/Makefile.am b/Makefile.am
index 34a71d1ee30f20d3160177d68f7eeca0b6b1992d..c03717d661b534cc36a289f807f7610186c62074 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -366,6 +366,10 @@ wireshark_LDADD = \
 
 wireshark_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
 
+if HAVE_WIRESHARK_CPP
+nodist_EXTRA_wireshark_SOURCES = dummy.cpp
+endif
+
 if ENABLE_STATIC
 tshark_LDFLAGS = -Wl,-static -all-static
 else

diff --git a/configure.ac b/configure.ac
index 42a4987a1348b1544b85ca499e9c18e957c0df34..621f46533078bcaeae90cf7856ee6a883b4ffc6e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -994,6 +994,7 @@ fi
 # 2.32.0: 24 Mar 2012
 # 2.34.0: 24 Sep 2012
 
+have_wireshark_cpp="false"
 if test "$have_gtk" = "no" ; then
        #
        # We don't have GTK+.
@@ -1007,6 +1008,8 @@ if test "$have_gtk" = "no" ; then
                #
                wireshark_bin="wireshark\$(EXEEXT)"
                wireshark_ui_lib="ui/qt/libqtui.a"
+               # Give automake a hint that it needs to use c++ linking.
+                have_wireshark_cpp="true"
                wireshark_man="wireshark.1"
                wireshark_SUBDIRS="codecs ui/qt"
        else
@@ -1046,7 +1049,7 @@ else
        wireshark_bin="wireshark\$(EXEEXT)"
        wireshark_ui_lib="ui/gtk/libgtkui.a"
        wireshark_man="wireshark.1"
-        wireshark_SUBDIRS="codecs ui/gtk"
+       wireshark_SUBDIRS="codecs ui/gtk"
        # Don't use GLIB_CFLAGS
        AM_PATH_GLIB_2_0(2.14.0, , AC_MSG_ERROR(GLib 2.14 or later distribution not found.), gthread gmodule)
 
@@ -1178,6 +1181,7 @@ fi
 AC_SUBST(wireshark_bin)
 AC_SUBST(wireshark_ui_lib)
 AC_SUBST(wireshark_man)
+AM_CONDITIONAL(HAVE_WIRESHARK_CPP, test "$have_wireshark_cpp" = "true")
 
 
 # Enable/disable tshark