diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 1fd3011826..6e17246086 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,6 +21,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +AM_DISTCHECK_CONFIGURE_FLAGS=@GUI_CONFIGURE_FLAGS@ ACLOCAL_AMFLAGS = `./aclocal-flags` if HAVE_LIBPY 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) |