automake-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 3/3] Regenerate autoools files


From: Stefano Lattarini
Subject: [PATCH 3/3] Regenerate autoools files
Date: Sat, 19 Jun 2010 17:10:13 +0200
User-agent: KMail/1.12.1 (Linux/2.6.30-2-686; KDE/4.3.4; i686; ; )

[[No ChangeLog entry]]
---
 Makefile.in              |   15 ++++++++++-----
 aclocal.m4               |    4 ++--
 configure                |   39 +++++++++++++++++++++++----------------
 doc/Makefile.in          |   15 ++++++++++-----
 lib/Automake/Makefile.in |   15 ++++++++++-----
 lib/Makefile.in          |   15 ++++++++++-----
 6 files changed, 65 insertions(+), 38 deletions(-)
From 9331e1b5a5d2d5af140d55c0ac4c8c786d117d25 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <address@hidden>
Date: Sat, 19 Jun 2010 12:03:57 +0200
Subject: [PATCH 3/3] Regenerate autoools files

---
 Makefile.in              |   15 ++++++++++-----
 aclocal.m4               |    4 ++--
 configure                |   39 +++++++++++++++++++++++----------------
 doc/Makefile.in          |   15 ++++++++++-----
 lib/Automake/Makefile.in |   15 ++++++++++-----
 lib/Makefile.in          |   15 ++++++++++-----
 6 files changed, 65 insertions(+), 38 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 2e1b412..bee0f4b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -523,11 +523,16 @@ cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) 
$(LISP)
          *) sdir=$(subdir)/$(srcdir) ;; \
        esac; \
        for i in $$list; do \
-         if test -f "$$i"; then \
-           echo "$(subdir)/$$i"; \
-         else \
-           echo "$$sdir/$$i"; \
-         fi; \
+         case $$i in \
+           /*) \
+             echo "$$i";; \
+           *) \
+             if test -f "$$i"; then \
+               echo "$(subdir)/$$i"; \
+             else \
+               echo "$$sdir/$$i"; \
+             fi;; \
+         esac; \
        done >> $(top_builddir)/cscope.files
 
 distclean-tags:
diff --git a/aclocal.m4 b/aclocal.m4
index 14ff862..3a03955 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -13,8 +13,8 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
-[m4_warning([this file was generated for autoconf 2.64.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
+[m4_warning([this file was generated for autoconf 2.65.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically 
`autoreconf'.])])
diff --git a/configure b/configure
index 5dd8a9a..9dc1545 100755
--- a/configure
+++ b/configure
@@ -1,12 +1,14 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64 for GNU Automake 1.11.
+# Generated by GNU Autoconf 2.65 for GNU Automake 1.11.
 #
 # Report bugs to <address@hidden>.
 #
+#
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
-# Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
+#
 #
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
@@ -527,7 +529,8 @@ as_tr_cpp="eval sed 
'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
 
-exec 7<&0 </dev/null 6>&1
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
 
 # Name of the host.
 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
@@ -1323,7 +1326,7 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 GNU Automake configure 1.11
-generated by GNU Autoconf 2.64
+generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
@@ -1340,7 +1343,7 @@ This file contains any messages produced by compilers 
while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by GNU Automake $as_me 1.11, which was
-generated by GNU Autoconf 2.64.  Invocation command line was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
 
@@ -1593,7 +1596,7 @@ fi
 for ac_site_file in "$ac_site_file1" "$ac_site_file2"
 do
   test "x$ac_site_file" = xNONE && continue
-  if test -r "$ac_site_file"; then
+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script 
$ac_site_file" >&5
 $as_echo "$as_me: loading site script $ac_site_file" >&6;}
     sed 's/^/| /' "$ac_site_file" >&5
@@ -1602,9 +1605,9 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
 done
 
 if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
+  # Some versions of bash will fail to source /dev/null (special files
+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
 $as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
@@ -2077,6 +2080,7 @@ IFS=$as_save_IFS
 
 fi
 
+  test -d ./--version && rmdir ./--version
   if test "${ac_cv_path_mkdir+set}" = set; then
     MKDIR_P="$ac_cv_path_mkdir -p"
   else
@@ -2084,7 +2088,6 @@ fi
     # value for MKDIR_P within a source directory, because that will
     # break other packages using the cache if that directory is
     # removed, or if the value is a relative name.
-    test -d ./--version && rmdir ./--version
     MKDIR_P="$ac_install_sh -d"
   fi
 fi
@@ -3278,7 +3281,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # values after options handling.
 ac_log="
 This file was extended by GNU Automake $as_me 1.11, which was
-generated by GNU Autoconf 2.64.  Invocation command line was
+generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -3313,6 +3316,7 @@ Usage: $0 [OPTION]... [TAG]...
 
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
   -q, --quiet, --silent
                    do not print progress messages
   -d, --debug      don't remove temporary files
@@ -3329,10 +3333,11 @@ General help using GNU software: 
<http://www.gnu.org/gethelp/>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; 
s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 GNU Automake config.status 1.11
-configured by $0, generated by GNU Autoconf 2.64,
-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; 
s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.65,
+  with options \\"\$ac_cs_config\\"
 
 Copyright (C) 2009 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
@@ -3370,6 +3375,8 @@ do
     ac_cs_recheck=: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
     $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=: ;;
   --file | --fil | --fi | --f )
@@ -3552,7 +3559,7 @@ s/'"$ac_delim"'$//
 t delim
 :nl
 h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
 t more1
 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
 p
@@ -3566,7 +3573,7 @@ s/.\{148\}//
 t nl
 :delim
 h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
 t more2
 s/["\\]/\\&/g; s/^/"/; s/$/"/
 p
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 8b77660..f87adee 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -540,11 +540,16 @@ cscopelist:  $(HEADERS) $(SOURCES) $(LISP)
          *) sdir=$(subdir)/$(srcdir) ;; \
        esac; \
        for i in $$list; do \
-         if test -f "$$i"; then \
-           echo "$(subdir)/$$i"; \
-         else \
-           echo "$$sdir/$$i"; \
-         fi; \
+         case $$i in \
+           /*) \
+             echo "$$i";; \
+           *) \
+             if test -f "$$i"; then \
+               echo "$(subdir)/$$i"; \
+             else \
+               echo "$$sdir/$$i"; \
+             fi;; \
+         esac; \
        done >> $(top_builddir)/cscope.files
 
 distclean-tags:
diff --git a/lib/Automake/Makefile.in b/lib/Automake/Makefile.in
index db148df..1894e0e 100644
--- a/lib/Automake/Makefile.in
+++ b/lib/Automake/Makefile.in
@@ -461,11 +461,16 @@ cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) 
$(LISP)
          *) sdir=$(subdir)/$(srcdir) ;; \
        esac; \
        for i in $$list; do \
-         if test -f "$$i"; then \
-           echo "$(subdir)/$$i"; \
-         else \
-           echo "$$sdir/$$i"; \
-         fi; \
+         case $$i in \
+           /*) \
+             echo "$$i";; \
+           *) \
+             if test -f "$$i"; then \
+               echo "$(subdir)/$$i"; \
+             else \
+               echo "$$sdir/$$i"; \
+             fi;; \
+         esac; \
        done >> $(top_builddir)/cscope.files
 
 distclean-tags:
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 78564c9..d12220f 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -436,11 +436,16 @@ cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) 
$(LISP)
          *) sdir=$(subdir)/$(srcdir) ;; \
        esac; \
        for i in $$list; do \
-         if test -f "$$i"; then \
-           echo "$(subdir)/$$i"; \
-         else \
-           echo "$$sdir/$$i"; \
-         fi; \
+         case $$i in \
+           /*) \
+             echo "$$i";; \
+           *) \
+             if test -f "$$i"; then \
+               echo "$(subdir)/$$i"; \
+             else \
+               echo "$$sdir/$$i"; \
+             fi;; \
+         esac; \
        done >> $(top_builddir)/cscope.files
 
 distclean-tags:
-- 
1.6.5


reply via email to

[Prev in Thread] Current Thread [Next in Thread]