Changeset e576789 for Config.in

Timestamp:

10/29/2013 03:42:03 PM (11 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

2.4, ablfs-more, legacy, new_features, trunk

Children:

5795ad7

Parents:

2e64c47

Message:

Merge ablfs branch. Normally, jhalfs should not perform differently
for building LFS

File:

• Config.in (modified) (16 diffs)

Config.in

@@ -23 +23 @@
 #                       bool "Hardened Linux From Scratch"
 
-                config  BOOK_BLFS
-                        bool "Beyond Linux From Scratch"
+#               config  BOOK_BLFS
+#                       bool "Beyond Linux From Scratch"
         endchoice
 
@@ -34 +34 @@
                 default "clfs3"         if BOOK_CLFS3
                 default "hlfs"          if BOOK_HLFS
-                default "blfs"          if BOOK_BLFS
+#               default "blfs"          if BOOK_BLFS
 
         config  RUN_ME
                 string
-                default "./jhalfs run"  if !BOOK_BLFS
-                default "./blfs-tool"   if BOOK_BLFS
+                default "./jhalfs run"# if !BOOK_BLFS
+#               default "./blfs-tool"   if BOOK_BLFS
         #--- End BOOK/script
 
@@ -61 +61 @@
                 config  WORKING_COPY
                         bool    "Working Copy"
-                        depends on !BOOK_BLFS
+#                       depends on !BOOK_BLFS
                         help
                                 #-- A local working copy
@@ -501 +501 @@
                 bool    "Add custom tools support"
                 default n
-                depends on !BOOK_BLFS
+#               depends on !BOOK_BLFS
                 help
                         #--- Activating this option additional packages you create
@@ -512 +512 @@
                 bool    "Add blfs-tool support"
                 default n
-                depends on !BOOK_BLFS && !BOOK_CLFS3
+#               depends on !BOOK_BLFS && !BOOK_CLFS3
+                depends on !BOOK_CLFS3
                 help
                         #--- Activating this option will install additional
@@ -574 +575 @@
                 default y
 
-                config  DEP_UNZIP
-                bool    "UnZip (required to install DocBook XML DTD)"
-                default y
-                depends on DEP_DBXML
-
                 #config DEP_DBXSL
                 #bool   "DocBook XSL (required)"
@@ -584 +580 @@
 
                 config  DEP_LYNX
-                bool    "lynx (required)"
+                bool    "lynx (optional, for reading the generated book)"
                 default y
 
@@ -597 +593 @@
                 config  DEP_GPM
                 bool    "GPM (optional, see help)"
-                default y
-                help
-                        #-- You MUST install the gpm bootscript manually
-                        #   and create its configuration file.
-                        #
-                        #   An alternative is to unselect this option and
-                        #   install gpm, its configuration file, and its
-                        #   bootscript using the custom tools support.
+                default n
+                help
+                        #-- if you install gpm, it will be started
+                        #   automatically on boot. You'll have to edit
+                        #   /etc/sysconfig/mouse for your system
 
                 config  DEP_SVN
@@ -610 +603 @@
                 default n
                 help
-                        #-- Subversion-1.3.1 will be installed. This version is
-                        #   old but does not rely on additional packages to be
-                        #   built.
-                        #
-                        #   If you are happy with this old version and don't
-                        #   need extra features, select this option.
+                        #-- Subversion is needed for updating the book
+                        #   sources. If you want ssl support, select
+                        #   OPENSSL below.
+
+                config  DEP_OPENSSL
+                bool    "OPENSSL (optional, see help)"
+                default n
+                help
+                        #-- selecting OPENSSL here allows to build
+                        #   subversion with ssl support, avoiding a later
+                        #   recompilation
+
+                config  DEP_PYTHON
+                bool    "PYTHON 2 (optional, see help)"
+                default n
+                help
+                        #-- selecting PYTHON 2 here allows to build
+                        #   the libxml2 and libxslt python modules,
+                        #   avoiding a later recompilation
+
         endmenu
         #--- End blfs-tool Support
@@ -622 +629 @@
         config  BLFS_ROOT
                 string "Directory root"
-                default "$HOME/blfs_root" if BOOK_BLFS
+#               default "$HOME/blfs_root" if BOOK_BLFS
                 default "/blfs_root" if BLFS_TOOL
-                depends on BOOK_BLFS || BLFS_TOOL
+#               depends on BOOK_BLFS || BLFS_TOOL
+                depends on BLFS_TOOL
                 help
                         #-- Full path to the directory where all required
@@ -632 +640 @@
                 string "BLFS sources directory"
                 default "blfs-xml"
-                depends on BOOK_BLFS || BLFS_TOOL
+#               depends on BOOK_BLFS || BLFS_TOOL
+                depends BLFS_TOOL
                 help
                         #-- The directory name under $BLFS_ROOT where the BLFS
@@ -640 +649 @@
                 string "Installed packages database directory"
                 default "/var/lib/jhalfs/BLFS"
-                depends on BOOK_BLFS || BLFS_TOOL || CUSTOM_TOOLS
+#               depends on BOOK_BLFS || BLFS_TOOL || CUSTOM_TOOLS
+                depends on BLFS_TOOL || CUSTOM_TOOLS
                 help
                         #-- Full path to the directory where the database of
@@ -661 +671 @@
 
 menu "--- General Settings"
-        depends on !BOOK_BLFS
+#       depends on !BOOK_BLFS
 
         #--- Set User Account
@@ -807 +817 @@
 
 menu "--- Build Settings"
-        depends on !BOOK_BLFS
+#       depends on !BOOK_BLFS
 
         #--- Test Suites
@@ -1012 +1022 @@
 
 menu "--- Advanced Features"
-        depends on !BOOK_BLFS
+#       depends on !BOOK_BLFS
 
         config  REPORT
@@ -1165 +1175 @@
         bool "Rebuild the Makefile (see help)"
         default n
-        depends on !BOOK_BLFS
+#       depends on !BOOK_BLFS
         help
                 #-- Rebuild the Makefile