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

Fix UI library dependency checking. 

svn path=/trunk/; revision=46902
This commit is contained in:
Gerald Combs 2013-01-02 19:19:10 +00:00
parent 6e77aef946
commit a50850c0cd
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.am
View File

@ -337,8 +337,14 @@ endif
# although it's also possible that -lgmodule is in GTK_LIBS but not
# GLIB_LIBS (that's the case on my machine right now, for example).
#
if HAVE_Qt
wireshark_ui_ldadd = ui/qt/libqtui.a
else
wireshark_ui_ldadd = ui/gtk/libgtkui.a
endif
wireshark_LDADD = \
@wireshark_ui_lib@ \
$(wireshark_ui_ldadd) \
ui/libui.a \
ui/libui_dirty.a \
codecs/libcodec.a \

9
configure.ac
View File

@ -1007,9 +1007,8 @@ if test "$have_gtk" = "no" ; then
# wouldn't think we had it, and thus wouldn't be here).
#
wireshark_bin="wireshark\$(EXEEXT)"
wireshark_ui_lib="ui/qt/libqtui.a"
# Give automake a hint that it needs to use c++ linking.
have_wireshark_cxx="true"
have_wireshark_cxx="yes"
wireshark_man="wireshark.1"
wireshark_SUBDIRS="codecs ui/qt"
else
@ -1031,7 +1030,6 @@ if test "$have_gtk" = "no" ; then
fi
fi
wireshark_bin=""
wireshark_ui_lib=""
wireshark_man=""
fi
# Use GLIB_CFLAGS
@ -1047,7 +1045,6 @@ else
# GTK+, so we wouldn't think we had it, and thus wouldn't be here).
#
wireshark_bin="wireshark\$(EXEEXT)"
wireshark_ui_lib="ui/gtk/libgtkui.a"
wireshark_man="wireshark.1"
wireshark_SUBDIRS="codecs ui/gtk"
# Don't use GLIB_CFLAGS
@ -1179,9 +1176,9 @@ then
fi
AC_SUBST(wireshark_bin)
AC_SUBST(wireshark_ui_lib)
AC_SUBST(wireshark_man)
AM_CONDITIONAL(HAVE_WIRESHARK_CXX, test "$have_wireshark_cxx" = "true")
AM_CONDITIONAL(HAVE_Qt, test "$have_qt" = "yes")
AM_CONDITIONAL(HAVE_WIRESHARK_CXX, test "$have_wireshark_cxx" = "yes")
# Enable/disable tshark