X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;ds=sidebyside;f=stage3%2Fhv-install-1;h=4a00ff688f68f26e25aff693253b500214c5ad17;hb=57ea0b9691a83f7c3828626dd539d5083a5b2a15;hp=a23118e11aad2614d664e10320093f33471d6cd3;hpb=14b8b7248a8be82f4073da3a5b6658517ec44a0b;p=hvlinux.git

diff --git a/stage3/hv-install-1 b/stage3/hv-install-1
index a23118e..4a00ff6 100755
--- a/stage3/hv-install-1
+++ b/stage3/hv-install-1
@@ -6,6 +6,7 @@ source /etc/profile
 check_for_root_user
 init_log_file
 
+ipkg -m noac ${BASHCOMPLETION}
 ipkg ${WHICH}
 ipkg -m acnb ${REISERFSPROGS}
 ipkg -m acnb ${POPT}
@@ -21,8 +22,8 @@ ipkg -j ${FCRON}
 ipkg ${OPENSSH}
 ipkg -s lynx ${LYNX}
 ipkg ${EXPAT}
-ipkg ${APR} "--with-installbuilddir=/usr/lib/apr-1/build"
-ipkg ${APR_UTIL} "--with-apr=/usr/bin/apr-1-config"
+ipkg ${APR} "--disable-static --with-installbuilddir=/usr/share/apr-1/build"
+ipkg ${APR_UTIL} "--with-apr=/usr --with-gdbm=/usr -with-openssl=/usr"
 ipkg ${NEON} "--with-ssl"
 ipkg -s tcl ${TCL}
 CFLAGS="${CFLAGS} -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_UNLOCK_NOTIFY=1" \
@@ -64,14 +65,15 @@ ipkg ${CURL}
 ipkg ${RSYNC}
 ipkg -m noac ${GETDATE}
 
-if [ "x${INST_TYPE}" = "xserver" -o "x${INST_TYPE}" = "xltsp-server" ]; then
-    ipkg ${MYSQL}
-fi
+ipkg -m acnb ${LIBARCHIVE} "--disable-static"
+ipkg -m acnb ${CMAKE}
+ipkg -m acnb ${MYSQL}
 
 # Archiving
 ipkg -m noac ${ZIP}
 ipkg -m noac ${UNZIP}
 ipkg -m noac ${UNRAR}
+ipkg -m noac ${P7ZIP}
 ipkg ${CPIO} "\
     --bindir=/bin \
     --libexecdir=/tmp \
@@ -98,6 +100,9 @@ ipkg -m noac ${COLORDIFF}
 ipkg ${INTLTOOL}
 
 ipkg -m acnb ${GIT} "--libexecdir=/usr/lib --with-gitconfig=/etc/gitconfig"
+ipkg -m noac ${MERCURIAL}
+
+ipkg ${DIALOG}
 
 # DocBook
 ipkg -m acnb ${SGML_COMMON}
@@ -137,7 +142,7 @@ ipkg -m noac ${CKERMIT}
 ipkg ${LIBTASN1}
 ipkg ${LIBUNISTRING}
 ipkg ${BDWGC}
-ipkg ${GUILE} \
+ipkg ${GUILE2} \
     --enable-posix \
     --disable-static \
     --enable-networking \
@@ -195,6 +200,8 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
         ipkg ${LIBTHEORA}
         ipkg ${XVIDCORE}
 
+        ipkg ${LIBX264} "--enable-shared"
+
         # Audio libraries
 	ipkg -m acnb ${AUDIOFILE}
         ipkg ${PORTAUDIO}