X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=blobdiff_plain;f=lib-src%2Fconfig.values.sh;h=f72304331b98e7d408df1b76d96b6aea86fc053f;hp=fc22128784758909f51a5c351bfabc8741c9a8d9;hb=2ef3eb9ac2ac322e018865b045cff4085f1d501c;hpb=afa9772e3fcbb4e80e3e4cfd1a40b4fccc6d08b8

diff --git a/lib-src/config.values.sh b/lib-src/config.values.sh
index fc22128..f723043 100644
--- a/lib-src/config.values.sh
+++ b/lib-src/config.values.sh
@@ -1,4 +1,7 @@
-#! /bin/sh
+: #-*- Perl -*-
+eval 'exec perl -w -S $0 ${1+"$@"}' # Portability kludge
+    if 0;
+
 # config.values.sh --- create config.values.in from ../configure
 
 # Author:	Martin Buchholz
@@ -35,17 +38,27 @@
 ## by an XEmacs Maintainer (consider yourself so blessed, if you are
 ## actually reading this commentary).
 ##
-if test ! -r ./configure; then
-  cd ..
-  if test ! -r ./configure; then
-    echo "Can't find configure!";
-    exit 1;
-  fi
-fi
-
-exec < ./configure > "lib-src/config.values.in"
-cat <<\EOF
-;;; Do not edit this file!
+
+if (! -r "./configure") {
+  chdir ".." or die "Can't chdir: $!";
+  if (! -r "./configure") {
+    die "Can't find configure!";
+  }
+}
+
+sub FileContents {
+  local $/ = undef; # Slurp mode
+  open (FILE, "< $_[0]") or die "$_[0]: $!";
+  my $contents = <FILE>;
+  close FILE or die "$_[0]: $!";
+  return $contents;
+}
+
+my $configure_contents = FileContents "./configure";
+my $cvi_contents = FileContents "lib-src/config.values.in";
+
+my $new_cvi_contents =
+";;; Do not edit this file!
 ;;; This file was automatically generated, by the config.values.sh script,
 ;;; from configure, which was itself automatically generated from configure.in.
 ;;;
@@ -62,15 +75,27 @@ cat <<\EOF
 ;;; Variables defined in configure by AC_SUBST follow:
 ;;; (These are used in Makefiles)
 
-EOF
-sed -n '/^s%@\([A-Za-z_][A-Za-z_]*\)@%\$\1%g$/ {
-  s/^s%@\([A-Za-z_][A-Za-z_]*\)@%\$\1%g$/\1 "@\1@"/
-  p
-}' | \
-sort -u
-cat <<\EOF
+";
+
+my %done;
+for my $var (sort { $a cmp $b }
+	     $configure_contents =~
+	     /^s\%\@([A-Za-z0-9_]+)\@\%\$[A-Za-z0-9_]+\%g/mg) {
+  $new_cvi_contents .= "$var \"\@$var\@\"\n" unless exists $done{$var};
+  $done{$var} = 1;
+}
 
+$new_cvi_contents .= "
 ;;; Variables defined in configure by AC_DEFINE and AC_DEFINE_UNQUOTED follow:
 ;;; (These are used in C code)
 
-EOF
+";
+
+if ($cvi_contents ne $new_cvi_contents) {
+  unlink "lib-src/config.values.in";
+  open (CVI, "> lib-src/config.values.in")
+    or die "lib-src/config.values.in: $!";
+  print CVI $new_cvi_contents;
+  close CVI
+    or die "lib-src/config.values.in: $!";
+}