[Box Backup-dev] COMMIT r720 - in box/trunk: . test/bbackupd/testfiles

[boxbackup-dev@fluffy.co.uk]

Author: chris
Date: 2006-08-07 21:22:15 +0000 (Mon, 07 Aug 2006)
New Revision: 720

Added:
   box/trunk/test/bbackupd/testfiles/bbackupd.conf
Removed:
   box/trunk/test/bbackupd/testfiles/bbackupd.conf.in
Modified:
   box/trunk/configure.ac
Log:
* test/bbackupd/testfiles/bbackupd.conf
* test/bbackupd/testfiles/bbackupd.conf.in
* configure.ac
- Reverted rev 718


Modified: box/trunk/configure.ac
===================================================================
--- box/trunk/configure.ac	2006-08-07 20:56:23 UTC (rev 719)
+++ box/trunk/configure.ac	2006-08-07 21:22:15 UTC (rev 720)
@@ -26,21 +26,14 @@
   # Use -rdynamic if we have gcc. This is needed for backtrace
   AC_SUBST([LDADD_RDYNAMIC], ['-rdynamic'])
 fi
+AC_PATH_PROG([PERL], [perl], [no])
+if test "x$PERL" != "xno"; then
+  AC_DEFINE_UNQUOTED([PERL_EXECUTABLE], ["$PERL"], [Location of the perl executable])
+else
+  AC_MSG_ERROR([[perl executable was not found]])
+fi
 
-AC_PATH_PROG([PERL], [perl], [AC_MSG_ERROR([[perl executable was not found]])])
 
-case $target_os in
-mingw*) 
-	AC_DEFINE_UNQUOTED([PERL_EXECUTABLE], ["perl"], [Command to run Perl])
-	PERL_NATIVE=perl
-	AC_SUBST([PERL_NATIVE])
-	;;
-*)
-	AC_DEFINE_UNQUOTED([PERL_EXECUTABLE], ["$PERL"], 
-		[Location of the perl executable])
-	;;
-esac
-
 ### Checks for libraries.
 
 if test "$target_os" != "mingw32" -a "$target_os" != "winnt"; then

Copied: box/trunk/test/bbackupd/testfiles/bbackupd.conf (from rev 717, box/trunk/test/bbackupd/testfiles/bbackupd.conf)


Property changes on: box/trunk/test/bbackupd/testfiles/bbackupd.conf
___________________________________________________________________
Name: svn:eol-style
   + native

Deleted: box/trunk/test/bbackupd/testfiles/bbackupd.conf.in
===================================================================
--- box/trunk/test/bbackupd/testfiles/bbackupd.conf.in	2006-08-07 20:56:23 UTC (rev 719)
+++ box/trunk/test/bbackupd/testfiles/bbackupd.conf.in	2006-08-07 21:22:15 UTC (rev 720)
@@ -1,50 +0,0 @@
-
-CertificateFile = testfiles/clientCerts.pem
-PrivateKeyFile = testfiles/clientPrivKey.pem
-TrustedCAsFile = testfiles/clientTrustedCAs.pem
-
-KeysFile = testfiles/bbackupd.keys
-
-DataDirectory = testfiles/bbackupd-data
-
-StoreHostname = localhost
-AccountNumber = 0x01234567
-
-UpdateStoreInterval = 3
-MinimumFileAge = 4
-MaxUploadWait = 24
-
-FileTrackingSizeThreshold = 1024
-DiffingUploadSizeThreshold = 1024
-
-MaximumDiffingTime = 8
-
-ExtendedLogging = yes
-
-CommandSocket = testfiles/bbackupd.sock
-
-NotifyScript = @PERL_NATIVE@ testfiles/notifyscript.pl
-
-Server
-{
-	PidFile = testfiles/bbackupd.pid
-}
-
-BackupLocations
-{
-	Test1
-	{
-		Path = testfiles/TestDir1
-
-		ExcludeFile = testfiles/TestDir1/excluded_1
-		ExcludeFile = testfiles/TestDir1/excluded_2
-		ExcludeFilesRegex = \.excludethis$
-		ExcludeFilesRegex = EXCLUDE
-		AlwaysIncludeFile = testfiles/TestDir1/dont.excludethis
-		ExcludeDir = testfiles/TestDir1/exclude_dir
-		ExcludeDir = testfiles/TestDir1/exclude_dir_2
-		ExcludeDirsRegex = not_this_dir
-		AlwaysIncludeDirsRegex = ALWAYSINCLUDE
-	}
-}
-