File 1000-Further-trim-unnecessary-output-as-per-gar... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 1000-Further-trim-unnecessary-output-as-per-garazdawi-s-..patch of Package erlang (Revision b1dff5cbf87755f120bfe931af793e05)

Currently displaying revision b1dff5cbf87755f120bfe931af793e05 , Show latest

From 0a7a932f62740054a62a42ab6ca10e486f676e19 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Thu, 1 Oct 2020 13:47:09 +0100
Subject: [PATCH 3/5] Further trim unnecessary output (as per @garazdawi's
 .diff)

---
 erts/configure.in   |  1 -
 lib/wx/configure.in | 16 ++++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/lib/wx/configure.in b/lib/wx/configure.in
index 5a69738544..3ce422d89d 100644
--- a/lib/wx/configure.in
+++ b/lib/wx/configure.in
@@ -335,9 +335,15 @@ elif test  X"$MIXED_VC" = X"no"; then
     # Try to find debug libs first 
     # wxelibs=core,base,gl,aui,adv
 
+    AM_PATH_WXCONFIG($reqwx, wxWinWithGLDBG=1, wxWinWithGLDBG=0, [stc,xrc,html,adv,xml,core,base,gl,aui], [--unicode --debug=yes])
+
     AC_MSG_CHECKING(for debug build of wxWidgets)
+    if test "$wxWinWithGLDBG" = 1; then
+      AC_MSG_RESULT(yes);
+    else
+      AC_MSG_RESULT(no);
+    fi
 
-    AM_PATH_WXCONFIG($reqwx, wxWinWithGLDBG=1, wxWinWithGLDBG=0, [stc,xrc,html,adv,xml,core,base,gl,aui], [--unicode --debug=yes])
     DEBUG_WX_CFLAGS=$WX_CFLAGS
     DEBUG_WX_CXXFLAGS=$WX_CXXFLAGS
     DEBUG_WX_LIBS=$WX_LIBS
@@ -347,9 +353,15 @@ elif test  X"$MIXED_VC" = X"no"; then
     AC_SUBST(DEBUG_WX_LIBS)
     AC_SUBST(DEBUG_WX_LIBS_STATIC)
     
-    AC_MSG_CHECKING(for standard build of wxWidgets)
     AM_PATH_WXCONFIG($reqwx, wxWinWithGL=1, wxWinWithGL=0, [stc,xrc,html,adv,xml,core,base,gl,aui], [--unicode --debug=no])
 
+    AC_MSG_CHECKING(for standard build of wxWidgets)
+    if test "$wxWinWithGL" = 1; then
+      AC_MSG_RESULT(yes);
+    else
+      AC_MSG_RESULT(no);
+    fi
+
     if test "x$WX_LIBS_STATIC" = "x"; then
        WX_HAVE_STATIC_LIBS=false
     else
-- 
2.26.2

Places

File 1000-Further-trim-unnecessary-output-as-per-garazdawi-s-..patch of Package erlang (Revision b1dff5cbf87755f120bfe931af793e05)

Places