[lfsja-git] r12.0-92 対応。

[lfsbookja/lfsja-git.git] / configure

diff --git a/configure b/configure
index c8cd3ee..c3b7143 100755 (executable)
--- a/configure
+++ b/configure
@@ -623,7 +623,7 @@ TAKAOMFONTDIR
 TAKAOGFONTDIR
 FOP
 LYNX
-SVNVER
+GITVER
 DUMPDIR
 NOCHUNKS_OUTPUT
 NOCHUNKS_NAME
@@ -4737,24 +4737,34 @@ fi
 
 
 
-TARGETVER=r11.0-74
+TARGETVER=r12.0-90
+if test "x$revspec" = "xsystemd"; then
+  TARGETVER="$TARGETVER-systemd"
+fi
 
-(cd ${bookdir} && sh git-version.sh)
-if test -f ${bookdir}/version.ent; then
-  SVNVER=`grep 'ENTITY version ' ${bookdir}/version.ent | sed -e 's/^<!ENTITY version           \"//' -e 's/\">$//' | tr 'A-Z' 'a-z'`
-else
-  SVNVER='unknown'
+(cd ${bookdir} && sh git-version.sh $revspec)
+cp -p ${bookdir}/version.ent .
+if test -f ./version.ent; then
+  rm -f version.tmp
+  if test "x$revspec" = "xsysv"; then
+    grep -A1 "%sysv" version.ent >version.tmp
+  elif test "x$revspec" = "xsystemd"; then
+    grep -A1 "%systemd" version.ent >version.tmp
+  else
+    echo >version.tmp
+  fi
+  GITVER=`grep 'ENTITY version ' version.tmp | sed -e 's/^<!ENTITY version *\"\(.*\)\">/\1/'`
 fi
 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the original XML version" >&5
 printf %s "checking for the original XML version... " >&6; }
-if test ! "$SVNVER" = "$TARGETVER"; then
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SVNVER" >&5
-printf "%s\n" "$SVNVER" >&6; }
+if test ! "$GITVER" = "$TARGETVER"; then
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GITVER" >&5
+printf "%s\n" "$GITVER" >&6; }
   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Version of the original XML not $TARGETVER" >&5
 printf "%s\n" "$as_me: WARNING: Version of the original XML not $TARGETVER" >&2;}
 else
-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $SVNVER" >&5
-printf "%s\n" "$SVNVER" >&6; }
+  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GITVER" >&5
+printf "%s\n" "$GITVER" >&6; }
 fi
 
 
@@ -4925,7 +4935,7 @@ printf "%s\n" "found" >&6; }
   fi
 
 
-ac_config_files="$ac_config_files Makefile ctie/Makefile src/Makefile src/userconfig.xml src/appendices/Makefile src/chapter01/Makefile src/chapter02/Makefile src/chapter03/Makefile src/chapter04/Makefile src/chapter05/Makefile src/chapter06/Makefile src/chapter07/Makefile src/chapter08/Makefile src/chapter09/Makefile src/chapter10/Makefile src/chapter11/Makefile src/part3intro/Makefile src/prologue/Makefile src/stylesheets/Makefile src/stylesheets/lfs-xsl/Makefile src/stylesheets/lfs-xsl/pdf/Makefile src/stylesheets/lfs-xsl/xhtml/Makefile src/udev-lfs/Makefile src/udev-lfs/contrib/Makefile src/udev-lfs/contrib/debian/Makefile"
+ac_config_files="$ac_config_files Makefile ctie/Makefile src/Makefile src/userconfig.xml src/appendices/Makefile src/chapter01/Makefile src/chapter02/Makefile src/chapter03/Makefile src/chapter04/Makefile src/chapter05/Makefile src/chapter06/Makefile src/chapter07/Makefile src/chapter08/Makefile src/chapter09/Makefile src/chapter10/Makefile src/chapter10/kernel/Makefile src/chapter11/Makefile src/part3intro/Makefile src/prologue/Makefile src/stylesheets/Makefile src/stylesheets/lfs-xsl/Makefile src/stylesheets/lfs-xsl/pdf/Makefile src/stylesheets/lfs-xsl/xhtml/Makefile src/udev-lfs/Makefile src/udev-lfs/contrib/Makefile src/udev-lfs/contrib/debian/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -5683,6 +5693,7 @@ do
     "src/chapter08/Makefile") CONFIG_FILES="$CONFIG_FILES src/chapter08/Makefile" ;;
     "src/chapter09/Makefile") CONFIG_FILES="$CONFIG_FILES src/chapter09/Makefile" ;;
     "src/chapter10/Makefile") CONFIG_FILES="$CONFIG_FILES src/chapter10/Makefile" ;;
+    "src/chapter10/kernel/Makefile") CONFIG_FILES="$CONFIG_FILES src/chapter10/kernel/Makefile" ;;
     "src/chapter11/Makefile") CONFIG_FILES="$CONFIG_FILES src/chapter11/Makefile" ;;
     "src/part3intro/Makefile") CONFIG_FILES="$CONFIG_FILES src/part3intro/Makefile" ;;
     "src/prologue/Makefile") CONFIG_FILES="$CONFIG_FILES src/prologue/Makefile" ;;