[Box Backup-dev] COMMIT r543 - in box/trunk: . infrastructure/m4

[boxbackup-dev at fluffy.co.uk]

Author: martin
Date: 2006-03-12 22:54:11 +0000 (Sun, 12 Mar 2006)
New Revision: 543

Added:
   box/trunk/infrastructure/m4/ax_config_scripts.m4
Modified:
   box/trunk/configure.ac
Log:
Fix execute permission on substituted perl scripts

Modified: box/trunk/configure.ac
===================================================================
--- box/trunk/configure.ac	2006-03-11 05:23:32 UTC (rev 542)
+++ box/trunk/configure.ac	2006-03-12 22:54:11 UTC (rev 543)
@@ -209,21 +209,22 @@
 
 
 ### Output files
-AC_CONFIG_FILES([bin/bbackupd/bbackupd-config
-                 bin/bbackupquery/makedocumentation.pl
-                 bin/bbstored/bbstored-certs
-                 bin/bbstored/bbstored-config
-                 infrastructure/BoxPlatform.pm
-                 infrastructure/makebuildenv.pl
-                 infrastructure/makeparcels.pl
-                 lib/common/makeexception.pl
-                 lib/raidfile/raidfile-config
-                 lib/server/makeprotocol.pl
-                 runtest.pl
-                 test/backupstorefix/testfiles/testbackupstorefix.pl
-                 test/bbackupd/testfiles/extcheck1.pl
-                 test/bbackupd/testfiles/extcheck2.pl
-                 test/bbackupd/testfiles/notifyscript.pl])
+AC_CONFIG_FILES([infrastructure/BoxPlatform.pm])
+AX_CONFIG_SCRIPTS([bin/bbackupd/bbackupd-config
+                   bin/bbackupquery/makedocumentation.pl
+                   bin/bbstored/bbstored-certs
+                   bin/bbstored/bbstored-config
+                   infrastructure/makebuildenv.pl
+                   infrastructure/makeparcels.pl
+                   lib/common/makeexception.pl
+                   lib/raidfile/raidfile-config
+                   lib/server/makeprotocol.pl
+                   runtest.pl
+                   test/backupstorefix/testfiles/testbackupstorefix.pl
+                   test/bbackupd/testfiles/extcheck1.pl
+                   test/bbackupd/testfiles/extcheck2.pl
+                   test/bbackupd/testfiles/notifyscript.pl])
+# TODO: Need to do contrib/cygwin/install-cygwin-service.pl but location varies
 AC_OUTPUT
 
 # Configure the Box build system

Added: box/trunk/infrastructure/m4/ax_config_scripts.m4
===================================================================
--- box/trunk/infrastructure/m4/ax_config_scripts.m4	2006-03-11 05:23:32 UTC (rev 542)
+++ box/trunk/infrastructure/m4/ax_config_scripts.m4	2006-03-12 22:54:11 UTC (rev 543)
@@ -0,0 +1,16 @@
+dnl @synopsis AX_CONFIG_SCRIPTS(SCRIPT_FILE, ...)
+dnl
+dnl Run AC_CONFIG_FILES on a list of scripts while preserving execute
+dnl permission.
+dnl
+dnl @category Automake
+dnl @author Martin Ebourne <martin at zepler.org>
+dnl @script
+dnl @license AllPermissive
+
+AC_DEFUN([AX_CONFIG_SCRIPTS],[
+  AC_REQUIRE([AC_CONFIG_FILES])dnl
+  m4_foreach([SCRIPT_FILE],
+             m4_quote(m4_split(m4_normalize([$1]))),
+             [AC_CONFIG_FILES(SCRIPT_FILE, m4_quote(chmod +x SCRIPT_FILE))])dnl
+])