Règle le bug:

[hvlinux.git] / stage3 / hv-install-1

diff --git a/stage3/hv-install-1 b/stage3/hv-install-1
index 7d0f5bd..1059d67 100755 (executable)
--- a/stage3/hv-install-1
+++ b/stage3/hv-install-1
@@ -3,11 +3,7 @@
 source ../functions/main
 source /etc/profile
 
-if [ "x${USER}" != "xroot" ]; then
-    echo "You must be the superuser to install hvlinux."
-    exit 1
-fi
-
+check_for_root_user
 init_log_file
 
 ipkg ${WHICH}
@@ -28,7 +24,8 @@ ipkg ${APR} "--with-installbuilddir=/usr/lib/apr-1/build"
 ipkg ${APR_UTIL} "--with-apr=/usr/bin/apr-1-config"
 ipkg ${NEON} "--with-ssl"
 ipkg -s tcl ${TCL}
-ipkg ${SQLITE}
+CFLAGS="${CFLAGS} -DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_UNLOCK_NOTIFY=1" \
+    ipkg ${SQLITE} "--enable-threadsafe --enable-readline --enable-dynamic-extensions"
 ipkg -j ${SUBVERSION} "--without-berkeley-db"
 ipkg ${SUDO}
 ipkg ${STRACE}
@@ -72,7 +69,6 @@ ipkg -m noac ${UNRAR}
 ipkg ${CPIO}
 
 ipkg ${PARTED} "--disable-device-mapper"
-ipkg ${ED}
 ipkg ${BC} "--with-readline"
 INIT_D_PATH=/etc/rc.d/init.d \
     ipkg -m acnb ${FUSE}
@@ -162,7 +158,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
        ipkg ${LIBVORBIS}
        ipkg -m acnb ${FLAC}
        ipkg ${LAME}
-        ipkg ${LIBA52} "--enable-shared"
+        CFLAGS="-fPIC ${CFLAGS}" ipkg ${LIBA52} "--enable-shared"
 
        ipkg ${LIBID3TAG}
        ipkg ${LIBMAD}
@@ -179,7 +175,7 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
 
         # Audio servers
         ipkg ${SPEEX}
-       ipkg ${JACK} "--disable-portaudio"
+       ipkg ${JACK} "--disable-portaudio --libdir=/usr/lib"
 
        ipkg ${ALSA_PLUGINS} # Depends on pulseaudio
        ipkg ${VORBIS_TOOLS}