From 83745353d7eee8adb51f3b171c6732b1960a8fb7 Mon Sep 17 00:00:00 2001 From: Joshua Cogliati Date: Mon, 28 Dec 2020 11:53:34 -0700 Subject: [PATCH] If WX_CONFIG_CHECK missing, disable WX. (#84) --- configure.ac | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac index 307ca9e8..ed3278c8 100644 --- a/configure.ac +++ b/configure.ac @@ -34,6 +34,7 @@ AS_IF([test x${enable_gitid} = xyes], [AC_DEFINE([GITID],[1],[enable gitid in version])]) AM_CONDITIONAL([GITID], [test x${enable_gitid} = xyes]) +m4_ifdef([WX_CONFIG_CHECK], [ WX_CONFIG_OPTIONS WX_CONFIG_CHECK([3.0.0], [wxWin=1]) @@ -48,6 +49,11 @@ AM_COND_IF([WX], CXXFLAGS="$WX_CXXFLAGS_ONLY $CXXFLAGS" CFLAGS="$WX_CFLAGS_ONLY $CFLAGS" LIBS="$WX_LIBS $LIBS"]) + ], [ + AC_MSG_NOTICE([No WX_CONFIG_CHECK available]) + AM_CONDITIONAL([WX], [test 1 = 0]) +]) + AC_MSG_CHECKING([enable_x11]) AC_ARG_ENABLE([x11],