Changeset 1182 for trunk/m4

Timestamp:

Aug 25, 2010, 3:02:41 AM (13 years ago)

Author:

Peter Johansson

Message:

Merge release 0.8 into trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• m4/apache_LICENSE-2.0.txt (modified) (1 prop)
• m4/ax_cxx_check_flag.m4 (modified) (1 prop)
• m4/ax_cxxcpp_check_flag.m4 (modified) (1 prop)
• m4/ax_ld_check_flag.m4 (modified) (1 prop)
• m4/find_apr.m4 (modified) (1 prop)
• m4/pkg.m4 (modified) (1 prop)
• m4/yat_add_flag.m4 (modified) (1 prop)
• m4/yat_svn_release.m4 (modified) (5 diffs)

trunk/m4/yat_svn_release.m4

@@ -1 @@
-## $Id: yat_svn_release.m4 2116 2009-11-22 04:33:23Z peter $
+## $Id: yat_svn_release.m4 2301 2010-07-24 01:12:27Z peter $
 
-# serial 1  
+# serial 3 (yat 0.7)
 
 # SYNOPSIS
@@ -18 +18 @@
 m4_define([yat_svn_release_copyright], [
 #
-#   Copyright (C) 2009 Peter Johansson
+#   Copyright (C) 2009, 2010 Peter Johansson
 #
 #   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -42 +42 @@
   AC_REQUIRE([AC_PROG_EGREP])       
   AC_CHECK_PROGS([MD5], [md5sum gmd5sum md5 md5deep], [no])
-  m4_pushdef([YAT_OUTPUTFILE], [maintainer.am])
+  m4_pushdef([YAT_OUTPUTFILE], [m4_default([$1], [maintainer.am])])
 
-  AX_AC_PRINT_TO_FILE([maintainer.am], 
+  AX_AC_PRINT_TO_FILE(YAT_OUTPUTFILE, 
 [#  ]YAT_OUTPUTFILE[ generated by autoconf from $0
 ]yat_svn_release_copyright[
@@ -73 +73 @@
   *\"\$\$today\"*);; \\
   *) \\
-    echo \"NEWS: release date incorrect; expected '\$\$date'\" 1>&2;\\
+    echo \"NEWS: release date incorrect; expected '\$\$today'\" 1>&2;\\
     exit 1;; \\
   esac
@@ -113 +113 @@
     \$(MD5) \$\$a > \$\$a.MD5; \\
   done;
+  @test -z \"\$(RELEASE_HOOK)\" || \$(MAKE) \$(AM_MAKEFLAGS) \$(RELEASE_HOOK)
 ])
   m4_popdef([YAT_OUTPUTFILE])