osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Try to force configure to pick up CXXLINK. 

svn path=/trunk/; revision=46892
This commit is contained in:
Gerald Combs 2013-01-02 04:25:45 +00:00
parent 18580d6703
commit 28a69c080f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -50,7 +50,7 @@ bin_PROGRAMS = \
@rawshark_bin@
EXTRA_PROGRAMS = wireshark tshark capinfos editcap mergecap dftest \
randpkt text2pcap dumpcap reordercap rawshark
randpkt text2pcap dumpcap reordercap rawshark wireshark_cxx
#
# Wireshark configuration files are put in $(pkgdatadir).
@ -371,6 +371,8 @@ wireshark_CFLAGS = $(AM_CLEAN_CFLAGS) $(py_dissectors_dir)
# Unfortunately that check is done by automake and not configure.
# We do the following to try to avoid using c++ to link Wireshark at
# all times.
nodist_EXTRA_wireshark_cxx_SOURCES = dummy.cpp
wireshark_cxx_SOURCES =
if HAVE_WIRESHARK_CXX
wireshark_LINK = $(CXXLINK)