X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/7b00539c4c7fcded1c26e675a2aaa7c7bd659161..7f77e37b599a148f5c281f2b952f6377bf6c7173:/configure.ac

diff --git a/configure.ac b/configure.ac
index 4e83e754..84fcf5a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,19 +9,18 @@ dnl----- Licensing notice ---------------------------------------------------
 dnl
 dnl This file is part of Trivial IP Encryption (TrIPE).
 dnl
-dnl TrIPE is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2 of the License, or
-dnl (at your option) any later version.
+dnl TrIPE is free software: you can redistribute it and/or modify it under
+dnl the terms of the GNU General Public License as published by the Free
+dnl Software Foundation; either version 3 of the License, or (at your
+dnl option) any later version.
 dnl
-dnl TrIPE is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-dnl GNU General Public License for more details.
+dnl TrIPE is distributed in the hope that it will be useful, but WITHOUT
+dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+dnl FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+dnl for more details.
 dnl
 dnl You should have received a copy of the GNU General Public License
-dnl along with TrIPE; if not, write to the Free Software Foundation,
-dnl Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+dnl along with TrIPE.  If not, see <https://www.gnu.org/licenses/>.
 
 dnl--------------------------------------------------------------------------
 dnl Initialization.
@@ -38,7 +37,7 @@ AM_PROG_CC_C_O
 AX_CFLAGS_WARN_ALL
 AX_TYPE_SOCKLEN_T
 AC_CANONICAL_HOST
-AM_PROG_LIBTOOL
+AC_PROG_RANLIB
 
 AC_CHECK_PROGS([AUTOM4TE], [autom4te])
 
@@ -210,22 +209,19 @@ AC_ARG_WITH([wireshark],
 	    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], [
       mdw_cv_wireshark_plugin_dir=$(
-	$PKG_CONFIG --variable=plugindir "wireshark >= 1.12.1")])
+	$PKG_CONFIG --variable=plugindir "wireshark >= 1.12.1")
+      dnl It seems that the Debian package has a habit of bungling the
+      dnl plugin path (#779788, #857729, ...).
+      case "$mdw_cv_wireshark_plugin_dir" in
+	/usr//usr/*)
+	  mdw_cv_wireshark_plugin_dir=${mdw_cv_wireshark_plugin_dir#/usr/}
+	  ;;
+      esac])
     case "$mdw_cv_wireshark_plugin_dir" in
       /*)
 	if test ! -d "$mdw_cv_wireshark_plugin_dir"; then
@@ -242,11 +238,9 @@ case "$haveshark,$wireshark_plugindir" in
 	;;
     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
@@ -254,8 +248,6 @@ case "$haveshark,$needshark" in
     AC_MSG_ERROR([failed to configure Wireshark plugin])
     ;;
   yes,*)
-    WIRESHARK_CFLAGS="$GLIB_CFLAGS $WIRESHARK_CFLAGS"
-    AC_SUBST(WIRESHARK_CFLAGS)
     AC_SUBST(wireshark_plugindir)
     ;;
 esac