diff -Nurd -x'*~' grads-2.0.2/configure grads-2.0.2.patched/configure --- grads-2.0.2/configure 2012-11-08 11:02:00.000000000 -0700 +++ grads-2.0.2.patched/configure 2012-12-21 11:28:26.000000000 -0700 @@ -11217,7 +11217,7 @@ ga_saved_libs=$LIBS CPPFLAGS="" - for ga_inc_name in libpng12 ; do + for ga_inc_name in libpng15 ; do CPPFLAGS="$CPPFLAGS -I${ga_supplib_dir}/include/${ga_inc_name}" done @@ -11225,13 +11225,13 @@ LDFLAGS="-L${ga_supplib_dir}/lib " LIBS="$LIBS " - echo "$as_me:$LINENO: checking for main in -lpng12" >&5 -echo $ECHO_N "checking for main in -lpng12... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for main in -lpng15" >&5 +echo $ECHO_N "checking for main in -lpng15... $ECHO_C" >&6 if test "${ac_cv_lib_png12_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lpng12 $LIBS" +LIBS="-lpng15 $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -11387,7 +11387,7 @@ CPPFLAGS="" for ga_inc_name in gd ; do - CPPFLAGS="$CPPFLAGS -I${ga_supplib_dir}/include/${ga_inc_name}" + CPPFLAGS="$CPPFLAGS -I${ga_supplib_dir}/include" done CPPFLAGS="$CPPFLAGS " @@ -11609,7 +11609,7 @@ ga_lib_prefix='$(supp_lib_dir)/lib' ga_lib_suffix='.a' - for ga_lib_name in gd png12 z jpeg ; do + for ga_lib_name in gd png15 jpeg ; do printim_libs="$printim_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}" done @@ -11617,7 +11617,7 @@ ga_lib_prefix='$(supp_lib_dir)/lib' ga_lib_suffix='.a' - for ga_lib_name in gd png12 z ; do + for ga_lib_name in gd png15 ; do printim_libs="$printim_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}" done @@ -12848,7 +12848,7 @@ ga_saved_libs=$LIBS CPPFLAGS="" - for ga_inc_name in libpng12 ; do + for ga_inc_name in libpng15 ; do CPPFLAGS="$CPPFLAGS -I${ga_supplib_dir}/include/${ga_inc_name}" done @@ -12856,13 +12856,13 @@ LDFLAGS="-L${ga_supplib_dir}/lib " LIBS="$LIBS " - echo "$as_me:$LINENO: checking for main in -lpng12" >&5 -echo $ECHO_N "checking for main in -lpng12... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for main in -lpng15" >&5 +echo $ECHO_N "checking for main in -lpng15... $ECHO_C" >&6 if test "${ac_cv_lib_png12_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lpng12 $LIBS" +LIBS="-lpng15 $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -13236,7 +13236,7 @@ ga_lib_prefix='$(supp_lib_dir)/lib' ga_lib_suffix='.a' - for ga_lib_name in grib2c jasper png12 z ; do + for ga_lib_name in grib2c jasper png15 ; do grib2_libs="$grib2_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}" done @@ -13459,13 +13459,13 @@ echo "$as_me:$LINENO: result: $ac_cv_lib_grib2c_main" >&5 echo "${ECHO_T}$ac_cv_lib_grib2c_main" >&6 if test $ac_cv_lib_grib2c_main = yes; then - echo "$as_me:$LINENO: checking for main in -lpng12" >&5 -echo $ECHO_N "checking for main in -lpng12... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for main in -lpng15" >&5 +echo $ECHO_N "checking for main in -lpng15... $ECHO_C" >&6 if test "${ac_cv_lib_png12_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lpng12 $LIBS" +LIBS="-lpng15 $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF @@ -13965,7 +13965,7 @@ CPPFLAGS="" for ga_inc_name in udunits ; do - CPPFLAGS="$CPPFLAGS -I${ga_supplib_dir}/include/${ga_inc_name}" + CPPFLAGS="$CPPFLAGS -I${ga_supplib_dir}/include" done CPPFLAGS="$CPPFLAGS " @@ -14626,7 +14626,7 @@ ga_lib_prefix='$(supp_lib_dir)/lib' ga_lib_suffix='.a' - for ga_lib_name in mfhdf df udunits sz jpeg z ; do + for ga_lib_name in mfhdf df udunits sz jpeg ; do hdf_libs="$hdf_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}" done @@ -17175,7 +17175,7 @@ ga_lib_prefix='$(supp_lib_dir)/lib' ga_lib_suffix='.a' - for ga_lib_name in hdf5 sz z ; do + for ga_lib_name in hdf5 sz ; do hdf5_libs="$hdf5_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}" done @@ -18662,7 +18662,7 @@ ga_lib_prefix='$(supp_lib_dir)/lib' ga_lib_suffix='.a' - for ga_lib_name in udunits netcdf hdf5_hl hdf5 z sz curl ; do + for ga_lib_name in udunits netcdf hdf5_hl hdf5 sz curl ; do nc_libs="$nc_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}" done @@ -21613,7 +21613,7 @@ ga_lib_prefix='$(supp_lib_dir)/lib' ga_lib_suffix='.a' - for ga_lib_name in gadap dapclient dap curl xml2 z ; do + for ga_lib_name in gadap dapclient dap curl xml2 ; do gadap_libs="$gadap_libs ${ga_lib_prefix}${ga_lib_name}${ga_lib_suffix}" done