Commit Graph

50 Commits

Author SHA1 Message Date
Guy Harris d094fca460 Check for pkg-config.
The configure script uses pkg-config unconditionally, so you need it if
you're going to build Wireshark with the autotools.

Change-Id: Ibb0e5e37651256c7134303c8176f30a9150af699
Reviewed-on: https://code.wireshark.org/review/6085
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-27 23:17:38 +00:00
Stephen Fisher d5a4cc34ec Make autogen.sh look for "python3" if "python" isn't found before
giving up.

Change-Id: Id109c78f90da71c54c7b4fd6df20cc153248f46f
Reviewed-on: https://code.wireshark.org/review/5623
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-04 23:54:47 +00:00
Evan Huus 3fd9a5e613 Licensecheck improvements, just two errors left.
Spawned from https://www.wireshark.org/lists/wireshark-dev/201402/msg00024.html

Add some ignore rules for files that can't/shouldn't include a license header.

Reorganize some ignore rules to group rules with similar motivations.

Add a header to autogen.sh and attribute it to just "The Wireshark Authors"
since while Gilbert wrote the original version it's gone through so many changes
over the years that sorting out proper authorship is unnecessarily complex.

Add headers to Graeme Hewson's two files as verified by private email, and
update his address in the AUTHORS file per his request.

Add header to one of Ulf Lamping's files, as verified by private email.

Only remaining problem is the reedsolomon code.

Change-Id: Ifb7de8c4b4d79012553e29d459a0145d39f51df5
Reviewed-on: https://code.wireshark.org/review/145
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-08 16:51:42 +00:00
Guy Harris 4c506222d9 Don't assume $(uname) works; it's not a standard Bourne shell feature,
and we only assume a Bourne-compatible shell.

It's "OS X", not "OsX".

svn path=/trunk/; revision=50072
2013-06-20 00:27:52 +00:00
Evan Huus c0fda177b6 From Dirk J via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8821
if no make options are given to the macosx-setup.sh script by the user, the
script sets the number of parallel make jobs to 1.5x CPU cores.

Bonus enhancement: print the "export PKG_CONFIG_PATH" information in autogen.sh
on OsX, so people don't have to remember it.

svn path=/trunk/; revision=50070
2013-06-19 23:52:54 +00:00
Jeff Morriss d621d1c362 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5737 :
Python does have a way to check its version: -V (in all versions) and
--version (in 2.5 and higher).  Use the former, at least until we require a
version greater than 2.5.

This will make it easier in the future if we need to check the Python version
before continuing (I could not find a minimum version that we need).

svn path=/trunk/; revision=38447
2011-08-10 15:28:29 +00:00
Jeff Morriss 5a7e4a7365 Since we require autoconf 2.60 or later, update the error message to indicate that (rather than still indicating that we need only 2.52).
svn path=/trunk/; revision=26209
2008-09-15 19:57:56 +00:00
Jörg Mayer f965652175 We now require autoconf 2.60 to build.
svn path=/trunk/; revision=26180
2008-09-11 21:15:14 +00:00
Guy Harris 773e6321d8 Boost the automake version required to 1.9.
(Currently, configure.in also specifies the minimum autoconf and
automake versions, but the check for the automake version doesn't
produce an immediate failure - instead, you might get a flood of

	configure.in:16: option `tar-ustar' not recognized

errors *after*

	configure.in:16: require version 1.9, but have 1.x.x

and the diagnostic isn't as clear.)

svn path=/trunk/; revision=25242
2008-05-05 22:01:34 +00:00
Guy Harris c45d93e698 Wiretap no longer has its own configure script, so don't do
automake/autoconf stuff on it.

svn path=/trunk/; revision=23796
2007-12-07 22:33:46 +00:00
Jörg Mayer caf88eed61 Support for automake 1.10 (reported by Aamer Akhter)
svn path=/trunk/; revision=19571
2006-10-17 08:51:16 +00:00
Michael Tüxen d28febd342 Ethereal->wireshark
svn path=/trunk/; revision=18278
2006-05-31 20:21:45 +00:00
Gilbert Ramirez 6b90d6085e Allow automake and aclocal to share a common version number suffix, since
they come from the same package.

svn path=/trunk/; revision=14143
2005-04-19 22:27:05 +00:00
Guy Harris 8a8b883450 Set the svn:eol-style property on all text files to "native", so that
they have LF at the end of the line on UN*X and CR/LF on Windows;
hopefully this means that if a CR/LF version is checked in on Windows,
the CRs will be stripped so that they show up only when checked out on
Windows, not on UN*X.

svn path=/trunk/; revision=11400
2004-07-18 00:24:25 +00:00
Jörg Mayer e7e37d473c Run libtoolize after aclocal.m4 has been generated
svn path=/trunk/; revision=11006
2004-05-26 10:41:14 +00:00
Guy Harris aa458601f7 Some versions of libtool stick extra stuff after the version number,
e.g. some versions from the FreeBSD ports collection add
"-freebsd-ports".  Match non-white-space text after the version number.

svn path=/trunk/; revision=10766
2004-05-02 00:43:43 +00:00
Jörg Mayer 4670872d4e OK, I'm impatient. In case of problems, I'm to blame, not Olivier.
Olivier Biot:
	Merge epan/configure.in back into configure.in
	Leave epan/confiugre.in and epan/acinclude.m4 in case we need to
		undo this.

svn path=/trunk/; revision=10505
2004-03-27 11:52:51 +00:00
Jörg Mayer 4d9537919c Peter Kjellerstedt:
* Correct the version checks (use path expansion
  rather than regular expressions, and fail if the
  tools are not installed at all).
* Make it possible to specify other names for the
  auto* tools to use (e.g., automake-1.6 instead
  of automake).

svn path=/trunk/; revision=10383
2004-03-15 12:21:52 +00:00
Jörg Mayer 903e497f57 Maybe automake version handling will be right this time
svn path=/trunk/; revision=10349
2004-03-08 23:37:51 +00:00
Jörg Mayer f31b404a15 automake versions like 1.5.1 were not detected correctly
svn path=/trunk/; revision=10346
2004-03-08 22:44:19 +00:00
Jörg Mayer 4dbf16fbe1 Libtool requires version 1.4
svn path=/trunk/; revision=10309
2004-03-05 00:02:43 +00:00
Jörg Mayer 0ae44ada2f Hackremoval:
Automake newer than 1.4 survives if it finds more than one file for the
same package.

svn path=/trunk/; revision=10298
2004-03-04 08:25:23 +00:00
Guy Harris 409e955dbb Remove blanks after a parenthesis in the output of "autoconf --version"
and "automake --version".

We only appear to need autoconf 2.52, not 2.53.

svn path=/trunk/; revision=10294
2004-03-04 06:43:34 +00:00
Jörg Mayer c4884cab89 Require autoconf 2.53 and automake 1.6
svn path=/trunk/; revision=10287
2004-03-03 21:35:57 +00:00
Jörg Mayer e0d4c9a309 Don't print warnings about not finding glibtool
svn path=/trunk/; revision=7914
2003-06-22 22:50:40 +00:00
Jörg Mayer f8355dc7cb Cosmetic change
svn path=/trunk/; revision=7913
2003-06-22 22:23:33 +00:00
Guy Harris 9400764837 Handle Mac OS X calling libtool "glibtool" and calling libtoolize "glibtoolize".
svn path=/trunk/; revision=7898
2003-06-19 00:28:14 +00:00
Jörg Mayer 99209e3651 Comment out usage for obsolete configure args support
svn path=/trunk/; revision=7155
2003-02-15 03:17:17 +00:00
Jörg Mayer 4c50ff909d aclocal-flags, autogen.sh:
- Fix handling of aclocal include flags for aclocal-include

autogen.sh:
- Name version variables individually
- Disable configure at end of autogen.sh

svn path=/trunk/; revision=6965
2003-01-22 00:19:00 +00:00
Gerald Combs 3f72fbbb25 autogen.sh was accidentally modified with the last checkin. Back out
of the changes.

svn path=/trunk/; revision=6342
2002-09-27 02:55:00 +00:00
Gerald Combs e23851ca23 Bump the version up to 0.9.7. The countdown begins. Too bad our
releases don't involve explosive bolts like NASA launches do.

Bring the ChangeLog and NEWS files up to date to the end of August.

svn path=/trunk/; revision=6341
2002-09-26 19:06:43 +00:00
Jörg Mayer 32ba9c2885 As per Guys idea: Delete files in aclocal-missing if test succeeds.
svn path=/trunk/; revision=6113
2002-08-28 12:25:54 +00:00
Jörg Mayer 2bdb0230e5 Implement an alternative method to provide missing aclocal files:
Check if a development file for the package is present and install
the corresponding m4 file in aclocal-missing if it isn't.

Add glib, glib-2.0 and gtk-2.0 to the fallback directory.

svn path=/trunk/; revision=6102
2002-08-27 23:00:04 +00:00
Jörg Mayer c8a1cc363f Disable the aclocal-fallback feature for aclocal (and thus automake)
version 1.4

svn path=/trunk/; revision=6086
2002-08-26 02:14:55 +00:00
Jörg Mayer 365bb11df4 Allow running autogen.sh on systems that do not have gtk.m4 installed.
That way it should be possible to build tethereal from cvs. Also,
Fallback files may be added to the aclocal-fallback/ directory in case
other optional packages come up.

svn path=/trunk/; revision=6071
2002-08-23 21:12:32 +00:00
Guy Harris a81a607ed5 Use "--force" with "libtoolize", so it doesn't whine, but save
"config.guess" and "config.sub" vefore running "libtool", and restore
them after running "libtool", so that it doesn't gratuitously "help" us
by installing whatever old versions of those scripts happen to be part
of the version of libtool on the machine.

svn path=/trunk/; revision=4369
2001-12-09 21:05:54 +00:00
Guy Harris 1a2c3446a3 When libtoolizing, *don't* forcibly copy over all the files needed; that
will override our versions of "config.guess" and "config.sub", which we
don't want.  (We don't use "--force" with "automake --add-missing".)

svn path=/trunk/; revision=4363
2001-12-09 00:02:44 +00:00
Gilbert Ramirez 038774d586 Enable the building of any combination of ethereal, tethereal, and editcap.
If GTK+ is not detected, then ethereal is not built.

svn path=/trunk/; revision=2695
2000-11-22 04:03:22 +00:00
Guy Harris cba377df3c Give libethereal its own configuration file, and have that configuration
file, rather than the top-level Ethereal configuration file, check for
"inet_aton()", "inet_pton()", and "inet_ntop()".  Then make its
Makefile.am include the appropriate object files if necessary.
Otherwise, they don't get built and put into libethereal, and therefore
attempts to link with anything in libethereal that uses them fail on
platforms that lack ethem, causing the build to fail.

That means a bunch of things need to be fixed to cope with libethereal
having its own "config.h" file; this means removing the include of
"config.h" from some libethereal header files.  Move the definitions of
the path names used only by "resolv.c" to "resolv.c" from "resolv.h" (so
"resolv.h" doesn't need "config.h", define HAVE_PLUGINS in the configure
script (so we don't have to include it in "plugins.h" to check whether
HAVE_DLFCN_H is defined).

Unfortunately, stuff outside libethereal needs to know PLUGIN_DIR; for
now, define that in the top-level configuration file, and have Ethereal
and Tethereal pass it as an argument to "epan_init()" - that should be
cleaned up at some point.

Remove from the top-level configure script checks for things used only
in libethereal.

svn path=/trunk/; revision=2498
2000-10-16 23:18:05 +00:00
Gilbert Ramirez b3f64359bb Check for python before configuring CVS sources.
svn path=/trunk/; revision=2493
2000-10-14 04:09:04 +00:00
Guy Harris ec9f9cb687 Add a script, "aclocal-flags", which figures out where
1) aclocal expects autoconf/automake macros to be hidden;

	2) GTK+ hid its autoconf/automake macros;

and, if both places exist but aren't the same directory, returns a "-I"
flag to tell aclocal to look in GTK+'s directory.

Then have "autogen.sh", and Makefiles in directories with "acinclude.m4"
files, use that script and pass what flag it supplies, if any, to
aclocal.

This should, I hope, avoid problems such as those FreeBSD systems where
GTK+ was installed from a port or package (and thus stuck its macros in
"/usr/X11R6/share/aclocal") but aclocal doesn't look there.

(It doesn't solve the problem of somebody downloading and installing,
say, libtool from source - which means it probably shows up under
"/usr/local", with its macros in "/usr/local/share/aclocal" - on a
system that comes with aclocal (meaning it probably just looks in
"/usr/share/aclocal", but that may be best fixed by, whenever you
download a source tarball for something that's part of your OS,
configuring it to install in the standard system directories and
*overwriting* your OS's version.)

svn path=/trunk/; revision=2165
2000-07-26 08:03:57 +00:00
Guy Harris 9a1e130403 Improved "autogen.sh" script from Bruce Korb.
svn path=/trunk/; revision=2154
2000-07-22 20:00:29 +00:00
Gilbert Ramirez a2ab3f8c5a Add Peter Kjellerstedt <peter.kjellerstedt@axis.com>'s patches
to add Axis ethernet vendor ID, use libtoolize in autogen.sh, and
provide the very dangerous option of installing ethereal setuid.

I've added a "DANGEROUS" comment to the description of the
--enable-setuid-install option which displays in "./configure --help".

Removed generated files tha old libltdl/.cvsignore brought to my
attention by Peter.

svn path=/trunk/; revision=1616
2000-02-11 03:17:58 +00:00
Guy Harris 16b8642f8d Add a check for "libtool".
Add the minimum version of {autoconf,automake,libtool} required to the
message printed if it's not found (having it check to make sure you have
at least that version is a bit more work).

Update the paths for "ftp.gnu.org" to reflect the fact that they now give
each package its own subdirectory.

svn path=/trunk/; revision=1399
1999-12-30 21:34:58 +00:00
Gilbert Ramirez bf20c06bea Changed gtk subdirectory to use only Makefile.am, and not have a configure
script. The configuration is faster this way. Also, moved version to 0.7.3.

svn path=/trunk/; revision=614
1999-08-31 05:52:08 +00:00
Gilbert Ramirez e62dfe591b Added gtk subdirectory, with patched gtkclist.c in it. We can use this
optimized gtkclist until Guy's changes appear in the offical GTK+.

svn path=/trunk/; revision=593
1999-08-27 22:27:18 +00:00
Gilbert Ramirez c0fa3841ee Modified autoconf/automake files for doc subdirectory so that all of
Ethereal can be compiled in a build directory separated from the source
directory.

svn path=/trunk/; revision=468
1999-08-11 16:05:19 +00:00
Guy Harris 6e386b4451 Eliminate an extra comma from a message.
svn path=/trunk/; revision=429
1999-08-04 00:21:37 +00:00
Gilbert Ramirez b080b90479 Fixed some improper word choices in the echoed error messages.
svn path=/trunk/; revision=389
1999-07-27 05:19:10 +00:00
Gilbert Ramirez 1708722fc2 Removed automatically-generated files from CVS. Some files are generated,
others are copied into the build-tree by 'automake -a'. The autogen.sh
script runs autoheader, automake, and autoconf for the developer in order
to populate a fresh CVS image with the generated build tools.

svn path=/trunk/; revision=388
1999-07-27 04:43:22 +00:00