diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-08-21 18:39:39 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-08-21 18:39:39 +0000 |
| commit | d9ebff02be7b8b9bc3011db5fcd3c56460d286c9 (patch) | |
| tree | f645fe31fcbbfdffdcb3e49e1ba24013e63f12a2 /configure.ac | |
| parent | 438f2f4558d498b1e87149c8c6c0015afc9d449f (diff) | |
| download | wireshark-d9ebff02be7b8b9bc3011db5fcd3c56460d286c9.tar.gz | |
Arrange that "make distcheck" use the GUI configure flags used to
configure Wireshark, so we don't, for example, do "make distcheck" with
no options, and thus default to GTK+ 3, on a system without GTK+ 3 where
Wireshark was configured with --with-gtk2. (This also means that if
we're configuring only with Qt, or with GTK+ *and* Qt, "make distcheck"
will check with those.)
svn path=/trunk/; revision=51456
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index e3b3327215..7b52c8cd85 100644 --- a/configure.ac +++ b/configure.ac @@ -1333,7 +1333,8 @@ if test "x$enable_wireshark" = "xyes"; then [ CFLAGS="$CFLAGS $Qt_CFLAGS" CXXFLAGS="$CXXFLAGS $Qt_CFLAGS" - have_qt=yes + have_qt=yes + GUI_CONFIGURE_FLAGS="$GUI_CONFIGURE_FLAGS --with-qt" ], [AC_MSG_ERROR([Qt is not available])]) @@ -1362,6 +1363,7 @@ if test "x$enable_wireshark" = "xyes"; then CFLAGS="$CFLAGS $GTK_CFLAGS" CXXFLAGS="$CXXFLAGS $GTK_CFLAGS" have_gtk=yes + GUI_CONFIGURE_FLAGS="$GUI_CONFIGURE_FLAGS --with-gtk3" ], [AC_MSG_ERROR([GTK+ 3 is not available])]) elif test "x$with_gtk2" = "xyes"; then @@ -1374,10 +1376,12 @@ if test "x$enable_wireshark" = "xyes"; then CFLAGS="$CFLAGS $GTK_CFLAGS" CXXFLAGS="$CXXFLAGS $GTK_CFLAGS" have_gtk=yes + GUI_CONFIGURE_FLAGS="$GUI_CONFIGURE_FLAGS --with-gtk2" ], [AC_MSG_ERROR([GTK+ 2 is not available])]) fi fi +AC_SUBST(GUI_CONFIGURE_FLAGS) GLIB_MIN_VERSION=2.16.0 AC_SUBST(GLIB_MIN_VERSION) |