Commit Graph

37 Commits

Author SHA1 Message Date
guy 0f43797234 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.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@11400 f5534014-38df-0310-8fa8-9805f1628bb7
2004-07-18 00:24:25 +00:00
jmayer 835950a78d Run libtoolize after aclocal.m4 has been generated
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@11006 f5534014-38df-0310-8fa8-9805f1628bb7
2004-05-26 10:41:14 +00:00
guy c5f5040a49 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.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@10766 f5534014-38df-0310-8fa8-9805f1628bb7
2004-05-02 00:43:43 +00:00
jmayer e6627950fd 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.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@10505 f5534014-38df-0310-8fa8-9805f1628bb7
2004-03-27 11:52:51 +00:00
jmayer f04d06e6d9 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).


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@10383 f5534014-38df-0310-8fa8-9805f1628bb7
2004-03-15 12:21:52 +00:00
jmayer 2f9cb0189c Maybe automake version handling will be right this time
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@10349 f5534014-38df-0310-8fa8-9805f1628bb7
2004-03-08 23:37:51 +00:00
jmayer 5860726307 automake versions like 1.5.1 were not detected correctly
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@10346 f5534014-38df-0310-8fa8-9805f1628bb7
2004-03-08 22:44:19 +00:00
jmayer 9414f07afb Libtool requires version 1.4
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@10309 f5534014-38df-0310-8fa8-9805f1628bb7
2004-03-05 00:02:43 +00:00
jmayer 02090e1cc1 Hackremoval:
Automake newer than 1.4 survives if it finds more than one file for the
same package.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@10298 f5534014-38df-0310-8fa8-9805f1628bb7
2004-03-04 08:25:23 +00:00
guy d2ee101ef3 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.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@10294 f5534014-38df-0310-8fa8-9805f1628bb7
2004-03-04 06:43:34 +00:00
jmayer 745aaf0adf Require autoconf 2.53 and automake 1.6
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@10287 f5534014-38df-0310-8fa8-9805f1628bb7
2004-03-03 21:35:57 +00:00
jmayer 21da889019 Don't print warnings about not finding glibtool
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@7914 f5534014-38df-0310-8fa8-9805f1628bb7
2003-06-22 22:50:40 +00:00
jmayer 97d58b0fab Cosmetic change
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@7913 f5534014-38df-0310-8fa8-9805f1628bb7
2003-06-22 22:23:33 +00:00
guy f9fa6ee27a Handle Mac OS X calling libtool "glibtool" and calling libtoolize "glibtoolize".
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@7898 f5534014-38df-0310-8fa8-9805f1628bb7
2003-06-19 00:28:14 +00:00
jmayer 6952aec7c5 Comment out usage for obsolete configure args support
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@7155 f5534014-38df-0310-8fa8-9805f1628bb7
2003-02-15 03:17:17 +00:00
jmayer bfd7c15fd7 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


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6965 f5534014-38df-0310-8fa8-9805f1628bb7
2003-01-22 00:19:00 +00:00
gerald 84a53b35f1 autogen.sh was accidentally modified with the last checkin. Back out
of the changes.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6342 f5534014-38df-0310-8fa8-9805f1628bb7
2002-09-27 02:55:00 +00:00
gerald 1c525cfbf6 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.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6341 f5534014-38df-0310-8fa8-9805f1628bb7
2002-09-26 19:06:43 +00:00
jmayer 224f51edd9 As per Guys idea: Delete files in aclocal-missing if test succeeds.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6113 f5534014-38df-0310-8fa8-9805f1628bb7
2002-08-28 12:25:54 +00:00
jmayer 663782ca80 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.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6102 f5534014-38df-0310-8fa8-9805f1628bb7
2002-08-27 23:00:04 +00:00
jmayer 9982d0643e Disable the aclocal-fallback feature for aclocal (and thus automake)
version 1.4


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6086 f5534014-38df-0310-8fa8-9805f1628bb7
2002-08-26 02:14:55 +00:00
jmayer ecbb8aad03 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.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@6071 f5534014-38df-0310-8fa8-9805f1628bb7
2002-08-23 21:12:32 +00:00
guy 9a31f9b449 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.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@4369 f5534014-38df-0310-8fa8-9805f1628bb7
2001-12-09 21:05:54 +00:00
guy e0f2022da6 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".)


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@4363 f5534014-38df-0310-8fa8-9805f1628bb7
2001-12-09 00:02:44 +00:00
gram 9f8965bca6 Enable the building of any combination of ethereal, tethereal, and editcap.
If GTK+ is not detected, then ethereal is not built.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@2695 f5534014-38df-0310-8fa8-9805f1628bb7
2000-11-22 04:03:22 +00:00
guy e660e87bfc 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.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@2498 f5534014-38df-0310-8fa8-9805f1628bb7
2000-10-16 23:18:05 +00:00
gram bbe978c6ac Check for python before configuring CVS sources.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@2493 f5534014-38df-0310-8fa8-9805f1628bb7
2000-10-14 04:09:04 +00:00
guy 9511862fbf 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.)


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@2165 f5534014-38df-0310-8fa8-9805f1628bb7
2000-07-26 08:03:57 +00:00
guy 281fde5597 Improved "autogen.sh" script from Bruce Korb.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@2154 f5534014-38df-0310-8fa8-9805f1628bb7
2000-07-22 20:00:29 +00:00
gram 5ddb6d986a 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.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1616 f5534014-38df-0310-8fa8-9805f1628bb7
2000-02-11 03:17:58 +00:00
guy 8de7c68cdf 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.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@1399 f5534014-38df-0310-8fa8-9805f1628bb7
1999-12-30 21:34:58 +00:00
gram 84276ab6ce 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.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@614 f5534014-38df-0310-8fa8-9805f1628bb7
1999-08-31 05:52:08 +00:00
gram db0d920911 Added gtk subdirectory, with patched gtkclist.c in it. We can use this
optimized gtkclist until Guy's changes appear in the offical GTK+.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@593 f5534014-38df-0310-8fa8-9805f1628bb7
1999-08-27 22:27:18 +00:00
gram f9ce4bfc49 Modified autoconf/automake files for doc subdirectory so that all of
Ethereal can be compiled in a build directory separated from the source
directory.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@468 f5534014-38df-0310-8fa8-9805f1628bb7
1999-08-11 16:05:19 +00:00
guy 17c3509c36 Eliminate an extra comma from a message.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@429 f5534014-38df-0310-8fa8-9805f1628bb7
1999-08-04 00:21:37 +00:00
gram 10ffd572cd Fixed some improper word choices in the echoed error messages.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@389 f5534014-38df-0310-8fa8-9805f1628bb7
1999-07-27 05:19:10 +00:00
gram 4c282359f3 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.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@388 f5534014-38df-0310-8fa8-9805f1628bb7
1999-07-27 04:43:22 +00:00