[Box Backup-commit] COMMIT r3027 - in box/trunk/infrastructure: . m4

[subversion at boxbackup.org]

Author: chris
Date: 2011-10-18 00:19:48 +0100 (Tue, 18 Oct 2011)
New Revision: 3027

Modified:
   box/trunk/infrastructure/BoxPlatform.pm.in
   box/trunk/infrastructure/m4/boxbackup_tests.m4
Log:
Patch to support building on MinGW, thanks to Paolo Tosco
(http://open3dalign.org, http://open3dqsar.org)


Modified: box/trunk/infrastructure/BoxPlatform.pm.in
===================================================================
--- box/trunk/infrastructure/BoxPlatform.pm.in	2011-10-11 23:46:01 UTC (rev 3026)
+++ box/trunk/infrastructure/BoxPlatform.pm.in	2011-10-17 23:19:48 UTC (rev 3027)
@@ -24,11 +24,13 @@
 	# Cygwin Builds usually something like CYGWIN_NT-5.0, CYGWIN_NT-5.1
 	# Box Backup tried on Win2000,XP only :)
 	$build_os = 'CYGWIN' if $build_os =~ m/CYGWIN/;
+	$build_os = 'MINGW32' if $build_os =~ m/MINGW32/;
 
 	$make_command = ($build_os eq 'Darwin') ? 'bsdmake' : ($build_os eq 'SunOS') ? 'gmake' : 'make';
 
 	$bsd_make = ($build_os ne 'Linux' && $build_os ne 'CYGWIN' &&
-		$build_os ne "SunOS" && $build_os ne 'GNU/kFreeBSD');
+		$build_os ne "MINGW32" && $build_os ne "SunOS"
+		&& $build_os ne 'GNU/kFreeBSD');
 
 	# blank extra flags by default
 	$platform_compile_line_extra = '';

Modified: box/trunk/infrastructure/m4/boxbackup_tests.m4
===================================================================
--- box/trunk/infrastructure/m4/boxbackup_tests.m4	2011-10-11 23:46:01 UTC (rev 3026)
+++ box/trunk/infrastructure/m4/boxbackup_tests.m4	2011-10-17 23:19:48 UTC (rev 3027)
@@ -67,11 +67,14 @@
 ### Checks for libraries.
 
 case $target_os in
-mingw32*) ;;
-winnt)    ;;
+mingw32*)
+	AC_CHECK_LIB([crypto -lws2_32 -lgdi32], [CRYPTO_lock])
+	;;
+winnt)
+	;;
 *)
-  AC_SEARCH_LIBS([nanosleep], [rt], [ac_have_nanosleep=yes],
-                 [AC_MSG_ERROR([[cannot find a short sleep function (nanosleep)]])])
+	AC_SEARCH_LIBS([nanosleep], [rt], [ac_have_nanosleep=yes],
+		[AC_MSG_ERROR([[cannot find a short sleep function (nanosleep)]])])
 	;;
 esac