From a065e98a229c22876fe1d90777775b29e42b4b86 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 25 Nov 2017 00:32:55 +0100 Subject: [PATCH] Regenerate configure after recent files additions Fix undefined variable in the makefile. --- configure | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/configure b/configure index 9468d8bed0..9e305a982e 100755 --- a/configure +++ b/configure @@ -701,6 +701,7 @@ COND_TOOLKIT_X11_USE_GUI_1_WXUNIV_1 COND_TOOLKIT_X11_USE_GUI_1 COND_TOOLKIT_X11 COND_TOOLKIT_Qt +COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0 COND_TOOLKIT_QT_USE_GUI_1 COND_TOOLKIT_QT COND_TOOLKIT_OSX_IPHONE_USE_GUI_1_WXUNIV_0 @@ -769,8 +770,6 @@ COND_PLATFORM_UNIX_1_TOOLKIT_GTK_TOOLKIT_VERSION_2 COND_PLATFORM_UNIX_1 COND_PLATFORM_UNIX_0 COND_PLATFORM_OS2_1 -COND_PLATFORM_MAC_1 -COND_PLATFORM_MAC_0 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 COND_PLATFORM_MACOSX_1_USE_OPENGL_1 COND_PLATFORM_MACOSX_1_USE_GUI_1 @@ -37875,16 +37874,6 @@ EOF COND_PLATFORM_MACOSX_1_USE_SOVERSION_1="" fi - COND_PLATFORM_MAC_0="#" - if test "x$PLATFORM_MAC" = "x0" ; then - COND_PLATFORM_MAC_0="" - fi - - COND_PLATFORM_MAC_1="#" - if test "x$PLATFORM_MAC" = "x1" ; then - COND_PLATFORM_MAC_1="" - fi - COND_PLATFORM_OS2_1="#" if test "x$PLATFORM_OS2" = "x1" ; then COND_PLATFORM_OS2_1="" @@ -38225,6 +38214,11 @@ EOF COND_TOOLKIT_QT_USE_GUI_1="" fi + COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0="#" + if test "x$TOOLKIT" = "xQT" -a "x$USE_GUI" = "x1" -a "x$WXUNIV" = "x0" ; then + COND_TOOLKIT_QT_USE_GUI_1_WXUNIV_0="" + fi + COND_TOOLKIT_Qt="#" if test "x$TOOLKIT" = "xQt" ; then COND_TOOLKIT_Qt=""