Regen.

diff --git a/configure b/configure
index 377f7339801eeb03767de98b8a2925948091fff8..e5af462941da1274b5c8898bd888a36a9095f47d 100755 (executable)
--- a/configure
+++ b/configure
@@ -24,25 +24,30 @@ fi
 # Name of the executable.
 as_me=`echo "$0" |sed 's,\(.*[\\/]\+\)\?\([^\\/]\+\)[\\/]*,\2,'`
 
-# If LINENO is not supported by the shell, produce a version of this
-# script where LINENO is hard coded.  Rewrite if not up to date only.
-# Comparing LINENO against _oline_ is not a good solution, since in
-# the case of embedded executables (such as config.status within
-# configure) you'd compare LINENO wrt config.status vs. _oline_ vs
-# configure.  Hence a useless rewrite (not to mention the risk of
-# ``infinite'' rewrites.  Merely check that LINENO is incremented
-# between two lines, which is a property guaranteed for _oline_, hence
-# it protects us from repetitive rewrites.  Be sure to have a test
-# that does detect non LINENO support...
+# Rewrite early, but we need PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! $SHELL" >conftest.sh
+  echo  "exit 0"   >>conftest.sh
+  chmod +x conftest.sh
+  if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conftest.sh
+fi
+
 as_lineno_1=$LINENO
 as_lineno_2=$LINENO
 as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
 if test "x$as_lineno_1"  = "x$as_lineno_2" ||
    test "x$as_lineno_3" != "x$as_lineno_2";
   then
-  # Find who we are.
+  # Find who we are.  Look in the path if we contain no path at all
+  # relative or not.
   case $0 in
-    *[\\/]* | ?:[\\/]* ) as_myself=$0 ;;
+    *[\\/]* ) as_myself=$0 ;;
     *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
@@ -53,24 +58,35 @@ done
 
        ;;
   esac
-  if test ! -f $as_myself; then
+  # We did not find ourselves, most probably we were run as `sh COMMAND'
+  # in which case we are not to be found in the path.
+  if test "x$as_myself" = x; then
+    as_myself=$0
+  fi
+  if test ! -f "$as_myself"; then
     { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
    { (exit 1); exit 1; }; }
   fi
-  if test ! -f $as_me.lineno ||
-     test x`ls -1dt $as_me.lineno $as_myself 2>/dev/null | sed 1q` \
-                != x$as_me.lineno; then
+  if test ! -f "$as_me.lineno" ||
+     test x`ls -1dt "$as_me.lineno" "$as_myself" 2>/dev/null | sed 1q` \
+                != x"$as_me.lineno"; then
      # Be sure to write the pattern so that it doesn't replace itself:
      # it must not match itself.
-     awk '{
-            if ($0 ~ /[$]LINENO/)
-              while (sub (/[$]LINENO/, NR))
-                continue
-            print
-          }' <$as_myself >$as_me.lineno
+     awk <$as_myself '
+           /[$]LINENO/ { printf "%d:", NR }
+                         { print }
+         ' |
+       sed '/[$]LINENO/s/^\([0-9][0-9]*\):\(.*\)[$]LINENO/\2\1/' \
+         >$as_me.lineno
     chmod +x $as_me.lineno
   fi
-  exec ${SHELL-/bin/sh} ./$as_me.lineno ${1+"$@"}
+
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensible to this).
+  . ./$as_me.lineno
+  # Exit status is that of the last command.
+  exit
 fi
 
 # Avoid depending upon Character Ranges.
@@ -111,19 +127,6 @@ else
 fi
 rm -f conf$$ conf$$.exe conf$$.file
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! $SHELL" >conftest.sh
-  echo  "exit 0"   >>conftest.sh
-  chmod +x conftest.sh
-  if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conftest.sh
-fi
-
 as_executable_p="test -f"
 
 # Sed expression to map a string onto a valid CPP name.
@@ -1728,25 +1731,30 @@ fi
 # Name of the executable.
 as_me=`echo "$0" |sed 's,\(.*[\\/]\+\)\?\([^\\/]\+\)[\\/]*,\2,'`
 
-# If LINENO is not supported by the shell, produce a version of this
-# script where LINENO is hard coded.  Rewrite if not up to date only.
-# Comparing LINENO against _oline_ is not a good solution, since in
-# the case of embedded executables (such as config.status within
-# configure) you'd compare LINENO wrt config.status vs. _oline_ vs
-# configure.  Hence a useless rewrite (not to mention the risk of
-# ``infinite'' rewrites.  Merely check that LINENO is incremented
-# between two lines, which is a property guaranteed for _oline_, hence
-# it protects us from repetitive rewrites.  Be sure to have a test
-# that does detect non LINENO support...
+# Rewrite early, but we need PATH_SEPARATOR.
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  echo "#! $SHELL" >conftest.sh
+  echo  "exit 0"   >>conftest.sh
+  chmod +x conftest.sh
+  if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then
+    PATH_SEPARATOR=';'
+  else
+    PATH_SEPARATOR=:
+  fi
+  rm -f conftest.sh
+fi
+
 as_lineno_1=$LINENO
 as_lineno_2=$LINENO
 as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
 if test "x$as_lineno_1"  = "x$as_lineno_2" ||
    test "x$as_lineno_3" != "x$as_lineno_2";
   then
-  # Find who we are.
+  # Find who we are.  Look in the path if we contain no path at all
+  # relative or not.
   case $0 in
-    *[\\/]* | ?:[\\/]* ) as_myself=$0 ;;
+    *[\\/]* ) as_myself=$0 ;;
     *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
@@ -1757,25 +1765,36 @@ done
 
        ;;
   esac
-  if test ! -f $as_myself; then
+  # We did not find ourselves, most probably we were run as `sh COMMAND'
+  # in which case we are not to be found in the path.
+  if test "x$as_myself" = x; then
+    as_myself=$0
+  fi
+  if test ! -f "$as_myself"; then
     { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
 echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
    { (exit 1); exit 1; }; }
   fi
-  if test ! -f $as_me.lineno ||
-     test x`ls -1dt $as_me.lineno $as_myself 2>/dev/null | sed 1q` \
-                != x$as_me.lineno; then
+  if test ! -f "$as_me.lineno" ||
+     test x`ls -1dt "$as_me.lineno" "$as_myself" 2>/dev/null | sed 1q` \
+                != x"$as_me.lineno"; then
      # Be sure to write the pattern so that it doesn't replace itself:
      # it must not match itself.
-     awk '{
-            if ($0 ~ /[$]LINENO/)
-              while (sub (/[$]LINENO/, NR))
-                continue
-            print
-          }' <$as_myself >$as_me.lineno
+     awk <$as_myself '
+           /[$]LINENO/ { printf "%d:", NR }
+                         { print }
+         ' |
+       sed '/[$]LINENO/s/^\([0-9][0-9]*\):\(.*\)[$]LINENO/\2\1/' \
+         >$as_me.lineno
     chmod +x $as_me.lineno
   fi
-  exec ${SHELL-/bin/sh} ./$as_me.lineno ${1+"$@"}
+
+  # Don't try to exec as it changes $[0], causing all sort of problems
+  # (the dirname of $[0] is not the place where we might find the
+  # original and so on.  Autoconf is especially sensible to this).
+  . ./$as_me.lineno
+  # Exit status is that of the last command.
+  exit
 fi
 
 # Avoid depending upon Character Ranges.
@@ -1816,19 +1835,6 @@ else
 fi
 rm -f conf$$ conf$$.exe conf$$.file
 
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! $SHELL" >conftest.sh
-  echo  "exit 0"   >>conftest.sh
-  chmod +x conftest.sh
-  if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conftest.sh
-fi
-
 as_executable_p="test -f"
 
 # Sed expression to map a string onto a valid CPP name.