diff --git a/scripts/common-build-dependencies.sh b/scripts/common-build-dependencies.sh
index 9f40330e..e2dedd21 100644
--- a/scripts/common-build-dependencies.sh
+++ b/scripts/common-build-dependencies.sh
@@ -3,6 +3,9 @@
 # used by OpenSCAD.
 # It's supposed to be included from the system specific scripts.
 #
+# scripts/uni-build-dependencies.sh - generic linux/bsd
+# scripts/macosx-build-             - mac osx options
+# scripts/mingw-x-build-            - not used, MXE handles all dependencies.
 
 build_freetype()
 {
@@ -67,7 +70,7 @@ build_fontconfig()
   tar xzf "fontconfig-$version.tar.gz"
   cd "fontconfig-$version"
   export PKG_CONFIG_PATH="$DEPLOYDIR/lib/pkgconfig"
-  ./configure --prefix="$DEPLOYDIR" --enable-libxml2
+  ./configure --prefix="$DEPLOYDIR" --enable-libxml2 --disable-docs
   unset PKG_CONFIG_PATH
   make -j$NUMCPU
   make install
@@ -113,7 +116,7 @@ build_gettext()
   tar xzf "gettext-$version.tar.gz"
   cd "gettext-$version"
 
-  ./configure --prefix="$DEPLOYDIR"
+  ./configure --prefix="$DEPLOYDIR" --disable-java
   make -j$NUMCPU
   make install
 }
diff --git a/scripts/uni-build-dependencies.sh b/scripts/uni-build-dependencies.sh
index e9f95a60..3084941f 100755
--- a/scripts/uni-build-dependencies.sh
+++ b/scripts/uni-build-dependencies.sh
@@ -532,23 +532,29 @@ build_eigen()
 
 # glib2 and dependencies
 
-build_gettext()
-{
-  version=$1
-  echo "Building gettext $version..."
-
-  cd "$BASEDIR"/src
-  rm -rf "gettext-$version"
-  if [ ! -f "glib-$version.tar.gz" ]; then
-    curl --insecure -LO "http://ftpmirror.gnu.org/gettext/gettext-$version.tar.gz"
-  fi
-  tar xzf "gettext-$version.tar.gz"
-  cd "gettext-$version"
-
-  ./configure --prefix="$DEPLOYDIR"
-  make -j$NUMCPU
-  make install
-}
+#build_gettext()
+#{
+#  version=$1
+#  ls -l $DEPLOYDIR/include/gettext-po.h
+#  if [ -e $DEPLOYDIR/include/gettext-po.h ]; then
+#    echo "gettext already installed. not building"
+#    return
+#  fi
+#
+#  echo "Building gettext $version..."
+#
+#  cd "$BASEDIR"/src
+#  rm -rf "gettext-$version"
+#  if [ ! -f "glib-$version.tar.gz" ]; then
+#    curl --insecure -LO "http://ftpmirror.gnu.org/gettext/gettext-$version.tar.gz"
+#  fi
+#  tar xzf "gettext-$version.tar.gz"
+#  cd "gettext-$version"
+#
+#  ./configure --prefix="$DEPLOYDIR"
+#  make -j$NUMCPU
+#  make install
+#}
 
 build_pkgconfig()
 {
@@ -743,7 +749,10 @@ build_cgal 4.0.2
 build_glew 1.9.0
 build_opencsg 1.3.2
 build_gettext 0.18.3.1
+exit 1
 build_glib2 2.38.2
+
+# the following are only needed for text()
 build_freetype 2.5.0.1
 build_libxml2 2.9.1
 build_fontconfig 2.11.0