chiark
/
gitweb
/
~mdw
/
tripe
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
debian/: Redo the multiarch support for Debhelper 9.
[tripe]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index f3b75ea234cd7c2d4e170313da97be1971993eaf..33ce67dd442ec50be78cfaffdb29dc4568f2b6e2 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-210,17
+210,7
@@
AC_ARG_WITH([wireshark],
esac],
[wantshark=yes mustshark=no])
esac],
[wantshark=yes mustshark=no])
-case "$wantshark" in
- yes)
- PKG_CHECK_MODULES([WIRESHARK], [wireshark >= 1.12.1],
- [haveshark=yes], [haveshark=no])
- ;;
- *)
- haveshark=no
- ;;
-esac
-
-case "$haveshark,$wireshark_plugindir" in
+case "$wantshark,$wireshark_plugindir" in
yes,unknown)
AC_CACHE_CHECK([where to put Wireshark plugins],
[mdw_cv_wireshark_plugin_dir], [
yes,unknown)
AC_CACHE_CHECK([where to put Wireshark plugins],
[mdw_cv_wireshark_plugin_dir], [
@@
-249,11
+239,9
@@
case "$haveshark,$wireshark_plugindir" in
;;
esac
;;
;;
esac
;;
-esac
-
-dnl If we're still interested, find Glib.
-case "$haveshark" in
- yes) AM_PATH_GLIB_2_0([2.4.0], [], [haveshark=false], [gmodule]) ;;
+ no,*)
+ haveshark=no
+ ;;
esac
case "$haveshark,$needshark" in
esac
case "$haveshark,$needshark" in
@@
-261,8
+249,6
@@
case "$haveshark,$needshark" in
AC_MSG_ERROR([failed to configure Wireshark plugin])
;;
yes,*)
AC_MSG_ERROR([failed to configure Wireshark plugin])
;;
yes,*)
- WIRESHARK_CFLAGS="$GLIB_CFLAGS $WIRESHARK_CFLAGS"
- AC_SUBST(WIRESHARK_CFLAGS)
AC_SUBST(wireshark_plugindir)
;;
esac
AC_SUBST(wireshark_plugindir)
;;
esac