diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-07-24 22:34:44 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-07-24 22:34:44 +0000 |
| commit | f317c7821d7325d977e70c81c756be8c7e0b8486 (patch) | |
| tree | 5daa69064940bd80c046f24bfb1825725e817616 /configure.ac | |
| parent | 9c5b6c76a621478d6f3715a8a7e4d34f7ee9e4f2 (diff) | |
| download | wireshark-f317c7821d7325d977e70c81c756be8c7e0b8486.tar.gz wireshark-f317c7821d7325d977e70c81c756be8c7e0b8486.tar.bz2 wireshark-f317c7821d7325d977e70c81c756be8c7e0b8486.zip | |
The files in aclocal-fallback are copies of .m4 files from various
packages, providing macros that we use in our configure script in case
somebody building from SVN doesn't happen to have the package installed
and thus doesn't happen to have those macros defined.
In the case of Qt, there *isn't* such a .m4 file, so we had to create
the macro. Move it to acinclude.m4, and rename it to
AC_WIRESHARK_QT_CHECK to indicate that it's our own check.
svn path=/trunk/; revision=50881
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index c63f3cf157..d06814da2c 100644 --- a/configure.ac +++ b/configure.ac @@ -1255,7 +1255,7 @@ if test "x$enable_wireshark" = "xyes"; then # Now make sure we have Qt and, if so, add the flags # for it to CFLAGS and CXXFLAGS. # - AM_PATH_QT($QT_MIN_VERSION, + AC_WIRESHARK_QT_CHECK($QT_MIN_VERSION, [ CFLAGS="$CFLAGS $Qt_CFLAGS" CXXFLAGS="$CXXFLAGS $Qt_CFLAGS" |