Travail sur stage5

[hvlinux.git] / stage5 / stage5-install

diff --git a/stage5/stage5-install b/stage5/stage5-install
index 61ef340..0eba619 100755 (executable)
--- a/stage5/stage5-install
+++ b/stage5/stage5-install
@@ -23,23 +23,23 @@ init_log_file
 # Scripts directory
 export SCRDIR=$(pwd)
 
-# X-Window
 if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; then
     # Gtk
+    ipkg_ac    ${LIBSIGCPP}
     ipkg_ac    ${GTK_DOC}
-#####    ipkg_ac    ${GLITZ} DEPRECATED
-    ipkg_ac    ${CAIRO} "--enable-glitz"
+###    ipkg_ac    ${GLITZ}
+    ipkg_ac    ${CAIRO}
     ipkg_ac    ${CAIROMM}
-    ipkg_ac    ${PANGO}
+    ipkg_ac_nb ${PANGO}
     ipkg_ac    ${ATK}
     ipkg_ac    ${GTK} "--without-libjasper"
     ipkg_ac    ${GTK_ENGINES}
     ipkg_ac    ${PYGOBJECT}
+    ipkg_ac    ${PYCAIRO}
     ipkg_ac    ${PYGTK}
-    ipkg_ac    ${LIBSIGCPP}
     ipkg_ac    ${GC}
     ipkg_ac    ${GLIBMM}
-    ipkg_ac    ${GTKMM}
+##    ipkg_ac    ${GTKMM}
 
     ipkg_cust  ${EMACS} cis-emacs
     ipkg_ac    ${HVCLOCK}
@@ -50,14 +50,38 @@ if [ "x${INST_TYPE}" = "xworkstation" -o "x${INST_TYPE}" = "xltsp-server" ]; the
     ipkg_ac    ${SHARED_MIME_INFO}
     ipkg_ac    ${STARTUP_NOTIFICATION}
     ipkg_ac    ${LIBWNCK}
+    ipkg_cust  ${ISO_CODES} cis-iso-codes
     ipkg_ac    ${LIBXKLAVIER}
     ipkg_ac    ${LIBGLADE}
-    ipkg_ac    ${LIBSOUP}
+    ipkg_ac    ${LIBTASN1}
+    ipkg_ac    ${GUILE} \
+        --enable-posix \
+        --disable-static \
+        --enable-networking \
+        --enable-regex
+    ipkg_ac    ${LIBGPG_ERROR}
+    ipkg_ac    ${LIBGCRYPT}
+    ipkg_ac_nb ${GNUTLS}
     ipkg_ac    ${LIBIDL}
+
+    # GNOME-2.X configuration
+    rscr mult "Configuring ${GNOME2_VER}" ./cis-gnome-config
+    source /etc/profile
+
+    ipkg_gnome ${ORBIT2}
+    ipkg_cust  ${GCONF} cis-gconf
+    ipkg_ac    ${LIBPROXY} "--with-gnome"
+    ipkg_gnome ${GNOME_KEYRING}
+    ipkg_ac    ${LIBSOUP}
+
 fi
 
 ipkg_ac   ${HELP2MAN}
 ipkg_ac   ${GSL}
+
+exit 1
+exit 1
+
 ipkg_cust ${CUPS}     cis-cups
 ipkg_cust ${SPLIX}    cis-splix # Drivers Samsung pour CUPS
 ipkg_ac   ${JASPER} "--enable-shared"
@@ -243,12 +267,6 @@ ipkg_ac_nb ${KVM}
 ipkg_ac_nb ${BRIDGE_UTILS}
 ipkg_cust  ${UML_UTILITIES} cis-uml-utilities
 
-ipkg_ac    ${GUILE} \
-    --enable-posix \
-    --disable-static \
-    --enable-networking \
-    --enable-regex
-
 ipkg_cust  ${CKERMIT} cis-ckermit
 
 # BitTorrent client