From e27bd4020d5c7cacc770e09af17dc3a915a3b9b1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Bj=C3=B6rn=20Lindqvist?= <bjourne@gmail.com>
Date: Fri, 30 Jun 2017 00:24:24 +0200
Subject: [PATCH] Build: let's remove the NO_UI variable

That option has no effect on the build just confuses people because they
think Factor can be built with/without the UI. The runtime never depends
on any ui libraries.
---
 GNUmakefile |  1 -
 build.sh    | 33 +++++++++++++--------------------
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index bce0d29244..1d4ebaabcf 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -149,7 +149,6 @@ help:
 	@echo ""
 	@echo "DEBUG=1  compile VM with debugging information"
 	@echo "SITE_CFLAGS=...  additional optimization flags"
-	@echo "NO_UI=1  don't link with X11 libraries (ignored on Mac OS X)"
 	@echo "X11=1  force link with X11 libraries instead of Cocoa (only on Mac OS X)"
 
 ALL = factor factor-ffi-test factor-lib
diff --git a/build.sh b/build.sh
index 967c4ee2b5..c05081c37f 100755
--- a/build.sh
+++ b/build.sh
@@ -11,7 +11,6 @@ ECHO=echo
 OS=
 ARCH=
 WORD=
-NO_UI=${NO_UI-}
 GIT_PROTOCOL=${GIT_PROTOCOL:="git"}
 GIT_URL=${GIT_URL:=$GIT_PROTOCOL"://factorcode.org/git/factor.git"}
 SCRIPT_ARGS="$*"
@@ -218,8 +217,6 @@ check_library_exists() {
     $CC $GCC_TEST -o $GCC_OUT -l $1 2>&-
     if [[ $? -ne 0 ]] ; then
         $ECHO "not found."
-        $ECHO "***Factor will compile NO_UI=1"
-        NO_UI=1
     else
         $ECHO "found."
     fi
@@ -230,25 +227,21 @@ check_library_exists() {
 }
 
 check_X11_libraries() {
-    if [ -z "$NO_UI" ]; then
-        check_library_exists GL
-        check_library_exists X11
-        check_library_exists pango-1.0
-    fi
+    check_library_exists GL
+    check_library_exists X11
+    check_library_exists pango-1.0
 }
 
 check_gtk_libraries() {
-    if [ -z "$NO_UI" ]; then
-        check_library_exists gobject-2.0
-        check_library_exists gtk-x11-2.0
-        check_library_exists gdk-x11-2.0
-        check_library_exists gdk_pixbuf-2.0
-        check_library_exists gtkglext-x11-1.0
-        check_library_exists atk-1.0
-        check_library_exists gio-2.0
-        check_library_exists gdkglext-x11-1.0
-        check_library_exists pango-1.0
-    fi
+    check_library_exists gobject-2.0
+    check_library_exists gtk-x11-2.0
+    check_library_exists gdk-x11-2.0
+    check_library_exists gdk_pixbuf-2.0
+    check_library_exists gtkglext-x11-1.0
+    check_library_exists atk-1.0
+    check_library_exists gio-2.0
+    check_library_exists gdkglext-x11-1.0
+    check_library_exists pango-1.0
 }
 
 
@@ -543,7 +536,7 @@ make_clean() {
 }
 
 make_factor() {
-    invoke_make CC=$CC CXX=$CXX NO_UI=$NO_UI $MAKE_TARGET -j5
+    invoke_make CC=$CC CXX=$CXX $MAKE_TARGET -j5
 }
 
 make_clean_factor() {
-- 
2.34.1