Mercurial > mxe-octave
view src/mingw-cfitsio-1-fixes.patch @ 3825:b6f31861c73e
osmesa:call autoreconf
* src/osmesa.mk: call autoreconf
author | John Donoghue |
---|---|
date | Tue, 03 Mar 2015 13:48:39 -0500 |
parents | 26e3a441d573 |
children | de7c1c03561a |
line wrap: on
line source
diff -u cfitsio.orig/configure cfitsio/configure --- cfitsio.orig/configure 2014-06-12 11:42:22.000000000 -0400 +++ cfitsio/configure 2014-06-26 15:38:26.323327942 -0400 @@ -1981,7 +1981,7 @@ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } fi done @@ -2122,7 +2122,7 @@ $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -2155,7 +2155,7 @@ $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -2188,7 +2188,7 @@ $as_echo "$ac_cv_target" >&6; } case $ac_cv_target in *-*-*) ;; -*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;; esac target=$ac_cv_target ac_save_IFS=$IFS; IFS='-' @@ -3592,7 +3592,7 @@ EXT="dec" ;; *) - echo "cfitsio: == Don't know what do do with $host" + echo "cfitsio: == X Don't know what do do with $host" ;; esac @@ -3946,7 +3946,7 @@ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -4716,6 +4716,10 @@ CFITSIO_SHLIB_SONAME="" lhea_shlib_cflags= case $EXT in + mingw32) + SHLIB_LD="$CC -shared" + SHLIB_SUFFIX=".dll" + ;; cygwin) SHLIB_LD="$CC -shared" SHLIB_SUFFIX=".dll" @@ -5878,7 +5882,7 @@ case $ac_config_target in "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; esac done @@ -6086,7 +6090,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -6114,7 +6118,7 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -6141,7 +6145,7 @@ case $ac_tag in *:-:* | *:-) cat >"$ac_tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -7036,7 +7040,7 @@ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "cfitsio.pc") CONFIG_FILES="$CONFIG_FILES cfitsio.pc" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; esac done @@ -7244,7 +7248,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -7272,7 +7276,7 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -7299,7 +7303,7 @@ case $ac_tag in *:-:* | *:-) cat >"$ac_tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac diff -u cfitsio.orig/configure.in cfitsio/configure.in --- cfitsio.orig/configure.in 2014-06-12 11:42:38.000000000 -0400 +++ cfitsio/configure.in 2014-06-26 15:38:26.324327963 -0400 @@ -159,7 +159,7 @@ EXT="dec" ;; *) - echo "cfitsio: == Don't know what do do with $host" + echo "cfitsio: == X Don't know what do do with $host" ;; esac @@ -379,6 +379,10 @@ CFITSIO_SHLIB_SONAME="" lhea_shlib_cflags= case $EXT in + mingw32) + SHLIB_LD="$CC -shared" + SHLIB_SUFFIX=".dll" + ;; cygwin) SHLIB_LD="$CC -shared" SHLIB_SUFFIX=".dll"