diff options
| author | Guy Harris <guy@alum.mit.edu> | 2009-10-16 22:28:25 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2009-10-16 22:28:25 +0000 |
| commit | 9c988fa8548f8d5eb2d31aa8699433c2356be984 (patch) | |
| tree | 71e3579b533a1d90eed85ab8a2fe152a40fe7b55 /configure.in | |
| parent | bba7f0977caa0c9d0c263bbbc1f35801650f468a (diff) | |
Putting the AC_CANONICAL_xxx macro(s) *after* AC_INIT seems to work, and
could fix cross-compilation problems, according to Jeff Morriss, and
"make dist" seems to build a ustar archive after we do that, so give
that a try. (I don't have any cross-compilers handy to test whether it
fixes cross-compilation or not.)
svn path=/trunk/; revision=30586
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/configure.in b/configure.in index 6320ecdda1..c6f20a74e6 100644 --- a/configure.in +++ b/configure.in @@ -2,17 +2,28 @@ # AC_PREREQ(2.60) +AC_INIT(wireshark, 1.3.1) + dnl Check for CPU / vendor / OS dnl The user is encouraged to use either `AC_CANONICAL_BUILD', or dnl `AC_CANONICAL_HOST', or `AC_CANONICAL_TARGET', depending on the dnl needs. Using `AC_CANONICAL_TARGET' is enough to run the two other dnl macros. +dnl +dnl As nothing in the Wireshark is itself a build tool (we are not, +dnl for example, a compiler that generates machine code), we probably +dnl don't need AC_CANONICAL_TARGET, so, in theory, we should be able +dnl to use AC_CANONICAL_BUILD and AC_CANONICAL_HOST - or perhaps just +dnl AC_CANONICAL_HOST - instead. Note that we do have tools, such as +dnl lemon, that need to be built for the build machine, not for the +dnl host machine, so we might need both. +dnl +dnl This has to be done *after* AC_INIT, otherwise autogen.sh fails. -dnl AC_CANONICAL_HOST dnl AC_CANONICAL_BUILD -dnl AC_CANONICAL_TARGET +dnl AC_CANONICAL_HOST +AC_CANONICAL_TARGET -AC_INIT(wireshark, 1.3.1) AM_INIT_AUTOMAKE([1.9 tar-ustar]) AM_DISABLE_STATIC |