blob: 7191bce4b3a8a63f6a55f1315d30014d4544d9ee [file] [log] [blame]
--- misc/redland-1.0.8/configure Fri Jul 4 18:00:39 2008
+++ misc/build/redland-1.0.8/configure Wed Feb 18 13:27:43 2009
@@ -4671,7 +4671,7 @@
cygwin*)
# func_win32_libid is a shell function defined in ltmain.sh
- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+ lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
lt_cv_file_magic_cmd='func_win32_libid'
;;
@@ -4680,7 +4680,7 @@
# func_win32_libid shell function, so use a weaker test based on 'objdump',
# unless we find 'file', for example because we are cross-compiling.
if ( file / ) >/dev/null 2>&1; then
- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+ lt_cv_deplibs_check_method='file_magic ^x86 archive|^x86 DLL'
lt_cv_file_magic_cmd='func_win32_libid'
else
lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
--- misc/redland-1.0.8/ltmain.sh Tue Apr 29 23:33:55 2008
+++ misc/build/redland-1.0.8/ltmain.sh Wed Feb 18 13:28:39 2009
@@ -1565,6 +1565,11 @@
[\\/]* | [A-Za-z]:[\\/]*) ;;
*)
absdir=`cd "$dir" && pwd`
+ case $host_os in
+ mingw*)
+ absdir=`cygpath -m $absdir`
+ ;;
+ esac
if test -z "$absdir"; then
$echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
absdir="$dir"
@@ -3262,9 +3267,9 @@
revision="$number_revision"
;;
freebsd-aout|freebsd-elf|sunos)
- current="$number_major"
- revision="$number_minor"
- age="0"
+ current=`expr $number_major + $number_minor`
+ age="$number_minor"
+ revision="$number_revision"
;;
irix|nonstopux)
current=`expr $number_major + $number_minor`
@@ -3344,8 +3349,8 @@
;;
freebsd-elf)
- major=".$current"
- versuffix=".$current";
+ major=.`expr $current - $age`
+ versuffix="$major"
;;
irix | nonstopux)