From 9bd66dc79d8cac34ee08a80ae0267a2b70307962 Mon Sep 17 00:00:00 2001 From: upstream svn Date: Tue, 18 Aug 2009 21:09:20 +0200 Subject: [PATCH] Upstream tarball 9774 --- .svn-revision | 2 +- configure | 16 ++++++++++++++++ configure.in | 8 ++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/.svn-revision b/.svn-revision index d2acb3a1..aa07d288 100644 --- a/.svn-revision +++ b/.svn-revision @@ -1 +1 @@ -9772 +9774 diff --git a/configure b/configure index e3fea42d..e7caad77 100755 --- a/configure +++ b/configure @@ -7782,6 +7782,22 @@ WXBASE_CPPFLAGS="$WX_CPPFLAGS -DwxUSE_GUI=0" +if test ${need_gui} = yes -a "${WX_PORT}" = base; then + { { echo "$as_me:$LINENO: error: + The selected components need a wxWidgets library with GUI, + but your installation is base-only. Please install a GUI + enabled version of wxWidgets and then retry. + " >&5 +echo "$as_me: error: + The selected components need a wxWidgets library with GUI, + but your installation is base-only. Please install a GUI + enabled version of wxWidgets and then retry. + " >&2;} + { (exit 1); exit 1; }; } + +fi + + if test ${SYS:-unknown} = win32; then if test -n "$ac_tool_prefix"; then diff --git a/configure.in b/configure.in index 9052b016..c85d9b21 100644 --- a/configure.in +++ b/configure.in @@ -251,6 +251,14 @@ WXBASE_CPPFLAGS="$WX_CPPFLAGS -DwxUSE_GUI=0" AC_SUBST([WXBASE_LIBS]) AC_SUBST([WXBASE_CPPFLAGS]) +AS_IF([test ${need_gui} = yes -a "${WX_PORT}" = base], + [AC_MSG_ERROR([ + The selected components need a wxWidgets library with GUI, + but your installation is base-only. Please install a GUI + enabled version of wxWidgets and then retry. + ])] +) + dnl Get flags for windres AC_ARG_VAR([RC], [Resource Compiler])dnl AC_ARG_VAR([RCFLAGS], [Resource Compiler Flags])dnl -- 2.11.4.GIT