[lfsja-git] r11.1-119 対応。

[lfsbookja/lfsja-git.git] / configure

diff --git a/configure b/configure
index 6c3e262..1708110 100755 (executable)
--- a/configure
+++ b/configure
@@ -623,7 +623,7 @@ TAKAOMFONTDIR
 TAKAOGFONTDIR
 FOP
 LYNX
-SVNVER
+GITVER
 DUMPDIR
 NOCHUNKS_OUTPUT
 NOCHUNKS_NAME
@@ -665,6 +665,9 @@ AM_BACKSLASH
 AM_DEFAULT_VERBOSITY
 AM_DEFAULT_V
 AM_V
+CSCOPE
+ETAGS
+CTAGS
 am__untar
 am__tar
 AMTAR
@@ -2845,6 +2848,20 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
+# Variables for tags utilities; see am/tags.am
+if test -z "$CTAGS"; then
+  CTAGS=ctags
+fi
+
+if test -z "$ETAGS"; then
+  ETAGS=etags
+fi
+
+if test -z "$CSCOPE"; then
+  CSCOPE=cscope
+fi
+
+
 
 # POSIX will say in a future version that running "rm -f" with no argument
 # is OK; and we want to be able to make that assumption in our Makefile
@@ -4720,24 +4737,34 @@ fi
 
 
 
-TARGETVER=r10.1-57
+TARGETVER=r11.1-119
+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