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.

diff --git a/GNUmakefile b/GNUmakefile
index bce0d29244d39712c9c631a99de314482da92def..1d4ebaabcfaf57e76516d84044fade2a9fd45467 100644 (file)
--- 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 967c4ee2b5fe469d0b6bbc0340a780a620c938cb..c05081c37f750e811621df2b05274113b87a6d41 100755 (executable)
--- 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() {