Commit Graph

17 Commits

Author SHA1 Message Date
Alexis La Goutte 757aa33220 Continue to remove $Id$ from top of file
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash)

Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd
Reviewed-on: https://code.wireshark.org/review/881
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31 18:48:06 +00:00
Guy Harris 95785b9100 Use "command -v", required by recent POSIX, rather than "which"; I seem
to remember this being suggested relatively recently on some mailing list
(either one of the Wireshark lists or tcpdump-workers, I think).

Handle systems where /usr/X11R6/bin is a symlink to /usr/bin and where
the user running autogen.sh has /usr/X11R6/bin before /usr/bin in their
$PATH.

svn path=/trunk/; revision=51315
2013-08-12 17:16:08 +00:00
Guy Harris 8e10fa73d5 Work around Solaris 11's pkg-config being in /usr/ccs/bin but its
aclocal directory apparently being in /usr/share/aclocal rather than the
non-existent /usr/ccs/share/aclocal.  (/usr/ccs is sort of an extension
of /usr for developers; I'm not sure why they stuck the pkg-config stuff
under /usr/share rather than /usr/ccs/share given that it's of interest
only to developers.)

svn path=/trunk/; revision=44922
2012-09-16 01:49:59 +00:00
Guy Harris c1b3e350ce Check for pkg-config's path as well, just in case it's installed
somewhere other than GLib (or if GLib isn't installed at all; that
configure script will fail in that case, but that's better than failing
because PKG_CHECK_MODULES wasn't defined, as that's a confusing failure
mode).

svn path=/trunk/; revision=36635
2011-04-14 02:49:20 +00:00
Guy Harris 089ee86fa2 We only support GLib 2.x/GTK+ 2.x, which uses pkg-config, not
gtk-config; use it instead.

svn path=/trunk/; revision=28876
2009-06-28 17:23:07 +00:00
Jörg Mayer 79eb0cfbad Make aclocal-flags executable again (hopefully fixes buildbot fc4)
svn path=/trunk/; revision=15187
2005-08-02 07:03:46 +00:00
Jörg Mayer 9f4c774448 Remove svn:executable
Add svn:eol-style native
Add svn:keywords Id

svn path=/trunk/; revision=15180
2005-08-02 05:46:16 +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
Michael Tüxen 146659be8d Suppress warning in case of gtk-config is not installed.
svn path=/trunk/; revision=11301
2004-07-03 21:35:30 +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
Gerald Combs 1caa03191c Put a "-I" before "$gtk_aclocal_dir".
svn path=/trunk/; revision=6977
2003-01-22 15:58:33 +00:00
Guy Harris a4280bade5 "echo -n" isn't portable, and neither is sticking "\c" at the end of the
string to be echoed; use "tr" to delete new lines and, while we're at
it, also delete carriage returns (just in case this is being run under
Cygwin or something such as that, and it produces lines ending with
CR-LF).  Don't use character classes - I seem to remember that some
versions of "tr" require you to put the classes in square brackets and
some other versions don't work if you put them in square brackets.

svn path=/trunk/; revision=6973
2003-01-22 02:14:26 +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
Jun-ichiro itojun Hagino b208c33e01 1.3 was committed by mistake
svn path=/trunk/; revision=4886
2002-03-06 06:36:22 +00:00
Jun-ichiro itojun Hagino 0ee492780f VRRPv3 (for IPv6) support, by sumikawa@kame.net
svn path=/trunk/; revision=4885
2002-03-06 06:33:37 +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 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