| --- misc/redland-1.0.8/configure Fri Jul 4 18:00:39 2008 |
| +++ misc/build/redland-1.0.8/configure Fri Sep 4 12:55:52 2015 |
| @@ -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)?' |
| @@ -8279,7 +8279,7 @@ |
| hardcode_shlibpath_var=no |
| ;; |
| |
| - freebsd1*) |
| + freebsd1.*) |
| ld_shlibs=no |
| ;; |
| |
| @@ -8295,7 +8295,7 @@ |
| ;; |
| |
| # Unfortunately, older versions of FreeBSD 2 do not have this feature. |
| - freebsd2*) |
| + freebsd2.*) |
| archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
| hardcode_direct=yes |
| hardcode_minus_L=yes |
| @@ -8928,7 +8928,7 @@ |
| shlibpath_var=LD_LIBRARY_PATH |
| ;; |
| |
| -freebsd1*) |
| +freebsd1.*) |
| dynamic_linker=no |
| ;; |
| |
| @@ -8939,7 +8939,7 @@ |
| objformat=`/usr/bin/objformat` |
| else |
| case $host_os in |
| - freebsd[123]*) objformat=aout ;; |
| + freebsd[123].*) objformat=aout ;; |
| *) objformat=elf ;; |
| esac |
| fi |
| @@ -8957,7 +8957,7 @@ |
| esac |
| shlibpath_var=LD_LIBRARY_PATH |
| case $host_os in |
| - freebsd2*) |
| + freebsd2.*) |
| shlibpath_overrides_runpath=yes |
| ;; |
| freebsd3.[01]* | freebsdelf3.[01]*) |
| @@ -11367,7 +11367,7 @@ |
| ;; |
| esac |
| ;; |
| - freebsd[12]*) |
| + freebsd[12].*) |
| # C++ shared libraries reported to be fairly broken before switch to ELF |
| ld_shlibs_CXX=no |
| ;; |
| @@ -12906,7 +12906,7 @@ |
| shlibpath_var=LD_LIBRARY_PATH |
| ;; |
| |
| -freebsd1*) |
| +freebsd1.*) |
| dynamic_linker=no |
| ;; |
| |
| @@ -12917,7 +12917,7 @@ |
| objformat=`/usr/bin/objformat` |
| else |
| case $host_os in |
| - freebsd[123]*) objformat=aout ;; |
| + freebsd[123].*) objformat=aout ;; |
| *) objformat=elf ;; |
| esac |
| fi |
| @@ -12935,7 +12935,7 @@ |
| esac |
| shlibpath_var=LD_LIBRARY_PATH |
| case $host_os in |
| - freebsd2*) |
| + freebsd2.*) |
| shlibpath_overrides_runpath=yes |
| ;; |
| freebsd3.[01]* | freebsdelf3.[01]*) |
| @@ -14943,7 +14943,7 @@ |
| hardcode_shlibpath_var_F77=no |
| ;; |
| |
| - freebsd1*) |
| + freebsd1.*) |
| ld_shlibs_F77=no |
| ;; |
| |
| @@ -14959,7 +14959,7 @@ |
| ;; |
| |
| # Unfortunately, older versions of FreeBSD 2 do not have this feature. |
| - freebsd2*) |
| + freebsd2.*) |
| archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
| hardcode_direct_F77=yes |
| hardcode_minus_L_F77=yes |
| @@ -15540,7 +15540,7 @@ |
| shlibpath_var=LD_LIBRARY_PATH |
| ;; |
| |
| -freebsd1*) |
| +freebsd1.*) |
| dynamic_linker=no |
| ;; |
| |
| @@ -15551,7 +15551,7 @@ |
| objformat=`/usr/bin/objformat` |
| else |
| case $host_os in |
| - freebsd[123]*) objformat=aout ;; |
| + freebsd[123].*) objformat=aout ;; |
| *) objformat=elf ;; |
| esac |
| fi |
| @@ -15569,7 +15569,7 @@ |
| esac |
| shlibpath_var=LD_LIBRARY_PATH |
| case $host_os in |
| - freebsd2*) |
| + freebsd2.*) |
| shlibpath_overrides_runpath=yes |
| ;; |
| freebsd3.[01]* | freebsdelf3.[01]*) |
| @@ -17577,7 +17577,7 @@ |
| hardcode_shlibpath_var_GCJ=no |
| ;; |
| |
| - freebsd1*) |
| + freebsd1.*) |
| ld_shlibs_GCJ=no |
| ;; |
| |
| @@ -17593,7 +17593,7 @@ |
| ;; |
| |
| # Unfortunately, older versions of FreeBSD 2 do not have this feature. |
| - freebsd2*) |
| + freebsd2.*) |
| archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' |
| hardcode_direct_GCJ=yes |
| hardcode_minus_L_GCJ=yes |
| @@ -18174,7 +18174,7 @@ |
| shlibpath_var=LD_LIBRARY_PATH |
| ;; |
| |
| -freebsd1*) |
| +freebsd1.*) |
| dynamic_linker=no |
| ;; |
| |
| @@ -18185,7 +18185,7 @@ |
| objformat=`/usr/bin/objformat` |
| else |
| case $host_os in |
| - freebsd[123]*) objformat=aout ;; |
| + freebsd[123].*) objformat=aout ;; |
| *) objformat=elf ;; |
| esac |
| fi |
| @@ -18203,7 +18203,7 @@ |
| esac |
| shlibpath_var=LD_LIBRARY_PATH |
| case $host_os in |
| - freebsd2*) |
| + freebsd2.*) |
| shlibpath_overrides_runpath=yes |
| ;; |
| freebsd3.[01]* | freebsdelf3.[01]*) |
| --- 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) |