X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage5%2Fhv-install-1;h=90062f96fdc36fd32c0df2d45480b114f17a7be2;hb=5f9f6fcac1961f4f1022a0f88600278ced439e1f;hp=293dae4ef37ab15374212a5a04ad8d64bdbe923a;hpb=0dcecf1e56bd53b7925216333e2d089712eaf5a6;p=hvlinux.git

diff --git a/stage5/hv-install-1 b/stage5/hv-install-1
index 293dae4..90062f9 100755
--- a/stage5/hv-install-1
+++ b/stage5/hv-install-1
@@ -155,15 +155,17 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
     ipkg ${LIBNOTIFY}
     ipkg ${LIBVPX} "--enable-shared"
 
-    ipkg -m acnb -t -j ${WEBKIT} "\
-        --libexecdir=/usr/lib/WebKitGTK \
-        --with-gstreamer=0.10 \
-        --enable-introspection \
-        --with-gtk=2.0 \
-        --disable-geolocation \
-        --disable-gtk-doc"
-    ipkg ${VALA}
-    NOCOLOR=1 ipkg ${MIDORI}
+    if [ "x${USE_WEBKIT}" = "xyes" ]; then
+        ipkg -m acnb -t -j ${WEBKIT} "\
+            --libexecdir=/usr/lib/WebKitGTK \
+            --with-gstreamer=0.10 \
+            --enable-introspection \
+            --with-gtk=2.0 \
+            --disable-geolocation \
+            --disable-gtk-doc"
+        ipkg ${VALA}
+        NOCOLOR=1 ipkg ${MIDORI}
+    fi
 
     ipkg -m noac -l "${FIREFOX}-xulrunner" ${FIREFOX}
     ipkg -m noac -l "${FIREFOX}-browser" ${FIREFOX}
@@ -174,7 +176,9 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
     ipkg -m acnb ${VLC}  "--enable-mozilla --enable-qt4 --enable-ncurses"
     ipkg ${SDL}
     ipkg -m noac ${AGG}
-    ipkg ${GNASH}
+    if [ "x${USE_GNASH}" = "xyes" ]; then
+        ipkg ${GNASH}
+    fi
 fi
 
 ipkg ${LIBGAMIN} "--libexecdir=/usr/sbin"
@@ -184,8 +188,12 @@ ipkg ${XARCHIVER}
 ipkg -m acnb ${LIBFM}
 ipkg ${PCMANFM}
 
-ipkg -s apache ${HTTPD} # Apache
-ipkg ${LIGHTTPD}
+if [ "x${USE_HTTPD}" = "xyes" ]; then
+    ipkg -s apache ${HTTPD}
+fi
+if [ "x${USE_LIGHTTPD}" = "xyes" ]; then
+    ipkg ${LIGHTTPD}
+fi
 ipkg ${PHP}
 
 if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then