[Box Backup-commit] COMMIT r1352 - box/chris/merge

[boxbackup-dev at fluffy.co.uk]

Author: chris
Date: 2007-03-04 22:47:59 +0000 (Sun, 04 Mar 2007)
New Revision: 1352

Modified:
   box/chris/merge/configure.ac
Log:
Simplify check for PERL

Define substitution TARGET_PERL and preprocessor PERL_EXECUTABLE to a 
native Perl (not Cygwin) on Win32, since Cygwin perl will not run inside 
bbackupd for unit tests (e.g. SyncAllowScript).

(refs #3)


Modified: box/chris/merge/configure.ac
===================================================================
--- box/chris/merge/configure.ac	2007-03-04 22:22:44 UTC (rev 1351)
+++ box/chris/merge/configure.ac	2007-03-04 22:47:59 UTC (rev 1352)
@@ -26,14 +26,22 @@
   # 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*) 
+	TARGET_PERL=perl
+	;;
+*)
+	TARGET_PERL=$PERL
+	;;
+esac
+
+AC_SUBST([TARGET_PERL])
+AC_DEFINE_UNQUOTED([PERL_EXECUTABLE], ["$TARGET_PERL"], 
+	[Location of the perl executable])
+
 ### Checks for libraries.
 
 case $target_os in