[Box Backup-dev] Makefile.extra?

[James O'Gorman]

This is a multi-part message in MIME format.
--------------000308010903010407020400
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

Martin Ebourne wrote:
> On Fri, 2006-02-24 at 17:17 +0000, James O'Gorman wrote:
>> I agree in principal, but maybe this is because my knowledge of compiled 
>> programs is slim, but what difference would it make to use a #define? 
>> You would still have to recompile wouldn't you? Excuse my ignorance if 
>> I'm completely missing the point here.
> 
> Ben's right, you never pass C source code through autoconf. We've got
> dozens of autoconf macros already and they're all #defines of course.

OK. I'll need someone's help with that then. I'm assuming C++ doesn't 
let you do "easy" string concatenation like Perl.

> The issue isn't about recompiling, it's about making changes. Autoconf
> only substitutes in files when you run configure. You really aren't
> going to do that after every change to a source file!

Right, got it.

>> OK. Should I work from HEAD or from the 0.10 release? (In which case 
>> which revision is the release? That commit email seems to have 
>> disappeared into the ether since Alaric blew everything up...)
> 
> Make the change to a checkout of the latest trunk. We can always merge
> it back to a branch for 0.10 if needed.
> 
> Don't use svn diff by itself in this one case though. As I said before,
> the diffs aren't really useable. Give the list of mv commands, then the
> diffs of just the changes on top of that.

Well I made the changes to my svn working copy, but for some reason 'svn 
diff .' only showed the changes to configure.ac. Maybe I did something 
wrong. svn status did show that I had renamed a load of files though.

I've attached a tar/gzip archive that has a shell script to rename the 
necessary files, and a directory with the individual patches I created 
with diff (not svn diff). I've also attached the single diff I got from 
svn diff for configure.ac.

Is the svn diff the preferable format? If so I'll see what's going on 
with that and submit a new set of patches.

James

--------------000308010903010407020400
Content-Type: text/plain; x-mac-type="0"; x-mac-creator="0";
 name="perl-patch-configure.ac"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="perl-patch-configure.ac"

Index: configure.ac
===================================================================
--- configure.ac	(revision 503)
+++ configure.ac	(working copy)
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([Box Backup], 0.09, [box at fluffy.co.uk])
+AC_INIT([Box Backup], 0.10, [box at fluffy.co.uk])
 AC_CONFIG_SRCDIR([lib/common/Box.h])
 AC_CONFIG_HEADERS([lib/common/BoxConfig.h])
 
@@ -26,6 +26,8 @@
   # Use -rdynamic if we have gcc. This is needed for backtrace
   AC_SUBST([LDADD_RDYNAMIC], ['-rdynamic'])
 fi
+AC_PROG_PATH([PERL], [perl], [/usr/bin/perl])
+AC_SUBST([PERL])
 
 
 ### Checks for libraries.
@@ -76,6 +78,8 @@
 if test "$target_os" != "mingw32"; then
   AC_HEADER_DIRENT
 fi
+AC_PROG_PATH([PERL], [perl], [/usr/bin/perl])
+AC_SUBST([PERL])
 
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
@@ -203,7 +207,25 @@
 
 
 ### Output files
-AC_CONFIG_FILES([infrastructure/BoxPlatform.pm])
+AC_CONFIG_FILES([infrastructure/BoxPlatform.pm bin/bbackupd/bbackupd-config.in
+		 bin/bbackupquery/Makefile.extra.in
+		 bin/bbackupquery/makedocumentation.pl.in
+		 bin/bbstored/Makefile.extra.in bin/bbstored/bbstored-certs.in
+		 bin/bbstored/bbstored-config.in
+		 contrib/cygwin/install-cygwin-service.pl.in
+		 infrastructure/makebuildenv.pl.in
+		 infrastructure/makeparcels.pl.in
+		 lib/backupclient/Makefile.extra.in
+		 lib/common/Makefile.extra.in lib/common/makeexception.pl.in
+		 lib/compress/Makefile.extra.in lib/crypto/Makefile.extra.in
+		 lib/raidfile/Makefile.extra.in lib/raidfile/raidfile-config.in
+		 lib/server/Makefile.extra.in lib/server/makeprotocol.pl.in
+		 test/backupstorefix/testfiles/testbackupstorefix.pl.in
+		 test/backupstorefix/testbackupstorefix.cpp.in
+		 test/basicserver/Makefile.extra.in
+		 test/bbackupd/testfiles/extcheck2.pl.in
+		 test/bbackupd/testfiles/extcheck1.pl.in
+		 test/bbackupd/testfiles/notifyscript.pl.in runtest.pl.in])
 AC_OUTPUT
 
 # Configure the Box build system

--------------000308010903010407020400
Content-Type: application/x-gzip; x-mac-type="0"; x-mac-creator="0";
 name="perl-ac-patches.tar.gz"
Content-Transfer-Encoding: base64
Content-Disposition: inline;
 filename="perl-ac-patches.tar.gz"

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
SSWVVFJJJZVUUkkllRSn/wMuLrM4AKAAAA==
--------------000308010903010407020400--