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

If we're looking for some version of GTK+, and don't find it, fail. 

That way, if somebody specifies --with-gtk[23] and that version of GTK+
isn't found, we fail with an indication that the version of GTK+ they
asked for isn't there, and if no GUI toolkit was specified, and they
didn't explicitly say "don't build Wireshark", we look for GTK+ 3 and,
if it's not found, let the user know explicitly.

svn path=/trunk/; revision=51323
This commit is contained in:
Guy Harris 2013-08-12 20:24:59 +00:00
parent bebe1200de
commit 50eb826406
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@ -1325,8 +1325,8 @@ if test "x$enable_wireshark" = "xyes"; then
CFLAGS="$CFLAGS $Qt_CFLAGS"
CXXFLAGS="$CXXFLAGS $Qt_CFLAGS"
have_qt=yes
]
, [AC_MSG_ERROR([Qt is not available])])
],
[AC_MSG_ERROR([Qt is not available])])
#
# XXX - greasy hack to make ui/gtk/recent.c
@ -1353,7 +1353,8 @@ if test "x$enable_wireshark" = "xyes"; then
CFLAGS="$CFLAGS $GTK_CFLAGS"
CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
have_gtk=yes
], have_gtk=no)
],
[AC_MSG_ERROR([GTK+ 3 is not available])])
elif test "x$with_gtk2" = "xyes"; then
#
# GTK+ 3 wasn't specified, and GTK+ 2 was specified;
@ -1364,7 +1365,8 @@ if test "x$enable_wireshark" = "xyes"; then
CFLAGS="$CFLAGS $GTK_CFLAGS"
CXXFLAGS="$CXXFLAGS $GTK_CFLAGS"
have_gtk=yes
], have_gtk=no)
],
[AC_MSG_ERROR([GTK+ 2 is not available])])
fi
fi