Replace extcap_interface_list() with append_extcap_interface_list().

[metze/wireshark/wip.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 5d45e447f6ba16bb35a0ac21b6bacb996c1d32e2..19b4e8516d6e9e438589341bcb3834b6d5a61121 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -2,7 +2,25 @@
 #
 # Run this to generate all the initial makefiles.
 #
-# $Id$
+# Copyright 2014 The Wireshark Authors
+#
+# Wireshark - Network traffic analyzer
+# By Gerald Combs <gerald@wireshark.org>
+# Copyright 1998 Gerald Combs
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 DIE=true
 PROJECT="Wireshark"
@@ -16,10 +34,16 @@ ACLOCAL=aclocal$AM_VERSION
 AUTOHEADER=autoheader
 AUTOMAKE=automake$AM_VERSION
 AUTOCONF=autoconf
+PKG_CONFIG=pkg-config
 
 # Check for python. Python did not support --version before version 2.5.
 # Until we require a version > 2.5, we should use -V.
-PYVER=`python -V 2>&1 | sed 's/Python *//'`
+PYVER=`exec python -V 2>&1 | sed 's/Python *//'`
+# If "python" isn't found, try "python3"
+if test "$PYVER" = "exec: python: not found"
+then
+    PYVER=`exec python3 -V 2>&1 | sed 's/Python *//'`
+fi
 case "$PYVER" in
 2*|3*)
   ;;
@@ -33,13 +57,12 @@ _EOF_
   DIE="exit 1"
 esac
 
-
 ACVER=`$AUTOCONF --version | grep '^autoconf' | sed 's/.*) *//'`
 case "$ACVER" in
-'' | 0.* | 1.* | 2.[0-5]* )
+'' | 0.* | 1.* | 2.[0-5]* | 2.6[0123]* )
   cat >&2 <<_EOF_
 
-       You must have autoconf 2.60 or later installed to compile $PROJECT.
+       You must have autoconf 2.64 or later installed to compile $PROJECT.
        Download the appropriate package for your distribution/OS,
        or get the source tarball at ftp://ftp.gnu.org/pub/gnu/autoconf/
 _EOF_
@@ -96,6 +119,20 @@ _EOF_
   ;;
 esac
 
+#
+# XXX - is there some minimum version for which we should be checking?
+#
+PCVER=`pkg-config --version`
+if test -z "$PCVER"; then
+  cat >&2 <<_EOF_
+
+       You must have pkg-config installed to compile $PROJECT.
+       Download the appropriate package for your distribution/OS,
+       or get the source tarball at http://pkgconfig.freedesktop.org/releases/
+_EOF_
+  DIE="exit 1"
+fi
+
 $DIE
 
 aclocal_flags=`./aclocal-flags`
@@ -123,7 +160,12 @@ $AUTOMAKE --add-missing --gnu $am_opt || exit 1
 echo $AUTOCONF
 $AUTOCONF || exit 1
 
-#./configure "$@" || exit 1
+if [ `uname -s` = Darwin ] ; then
+    echo
+    echo "To configure Wireshark on OS X, you will need to type:"
+    echo "export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/X11/lib/pkgconfig"
+    echo "before you can run configure."
+fi
 
 echo
 echo "Now type \"./configure [options]\" and \"make\" to compile $PROJECT."