Ticket #33828: patch-configure.2.diff

File patch-configure.2.diff, 4.2 KB (added by rachid.benshila@…, 12 years ago)

new confure por ncview to work with all gcc

  • configure

    old new  
    20352035  ac_status=$?
    20362036  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    20372037  (exit $ac_status); }
    2038 { (ac_try="$ac_compiler -V >&5"
     2038{ (ac_try="$ac_compiler -v >&5"
    20392039case "(($ac_try" in
    20402040  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    20412041  *) ac_try_echo=$ac_try;;
    20422042esac
    20432043eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
    2044   (eval "$ac_compiler -V >&5") 2>&5
     2044  (eval "$ac_compiler -v >&5") 2>&5
    20452045  ac_status=$?
    20462046  echo "$as_me:$LINENO: \$? = $ac_status" >&5
    20472047  (exit $ac_status); }
     
    82528252        echo "** Could not find the png.h file, so -frames support will not be included  **"
    82538253        echo "** Install the PNG library (and development headers) to fix this           **"
    82548254fi
    8255 PNG_LIBNAME=libpng.so
     8255PNG_LIBNAME=libpng.a
    82568256
    82578257# Check whether --with-png_libdir was given.
    82588258if test "${with_png_libdir+set}" = set; then
     
    84838483fi
    84848484
    84858485fi
    8486 PNG_LIBNAME=`echo $PNG_LIBNAME | sed s/lib// | sed s/\.so//`
     8486PNG_LIBNAME=`echo $PNG_LIBNAME | sed s/lib// | sed s/\.a//`
     8487
    84878488PNG_PRESENT=no
    84888489if test $PNG_INC_PRESENT = yes; then
    84898490        if test x$PNG_LIBDIR != x; then
     
    86458646if test x$NETCDF_CC_TEST_SAME = xcc; then
    86468647        NETCDF_CC_TEST_SAME=gcc
    86478648fi
    8648 if test x$CC_TEST_SAME != x$NETCDF_CC_TEST_SAME; then
    8649         echo "======================================================================"
    8650         echo "Configuration error: You specified that the \"$CC\" C compiler should be"
    8651         echo "used to build ncview, but the netcdf library was compiled with the \"$NETCDF_CC\""
    8652         echo "compiler.  Here is the path where I found the netcdf library:"
    8653         echo "     $NETCDF_LDFLAGS"
    8654         echo "You must use the same compiler for ncview as was used to build the netcdf library!"
    8655         echo " "
    8656         echo "There are two possible ways to fix this."
    8657         echo " "
    8658         echo "1) Download the netcdf library and compile it with the $CC compiler,"
    8659         echo "install it, and try again to build ncview.  NOTE that if you do this,"
    8660         echo "you might have more than one version of the netcdf library on your system,"
    8661         echo "built with differnt compilers, which can get confusing.  If you do this,"
    8662         echo "you will have to specify the path to the (new) version of nc-config"
    8663         echo "that was compiled using the $CC compiler by configuring ncview in a "
    8664         echo "way similar to this:"
    8665         echo " "
    8666         echo "   ./configure --with-nc-config=/path/to/newly/compiled/nc-config"
    8667         echo " "
    8668         echo "2) Configure ncview to use the $NETCDF_CC compiler."
    8669         echo "To do this, set environmental variable CC to $NETCDF_CC"
    8670         echo "and run ./configure again"
    8671         echo "==================================================================="
    8672         exit -1
    8673 fi
     8649#if test x$CC_TEST_SAME != x$NETCDF_CC_TEST_SAME; then
     8650#       echo "======================================================================"
     8651#       echo "Configuration error: You specified that the \"$CC\" C compiler should be"
     8652#       echo "used to build ncview, but the netcdf library was compiled with the \"$NETCDF_CC\""
     8653#       echo "compiler.  Here is the path where I found the netcdf library:"
     8654#       echo "     $NETCDF_LDFLAGS"
     8655#       echo "You must use the same compiler for ncview as was used to build the netcdf library!"
     8656#       echo " "
     8657#       echo "There are two possible ways to fix this."
     8658#       echo " "
     8659#       echo "1) Download the netcdf library and compile it with the $CC compiler,"
     8660#       echo "install it, and try again to build ncview.  NOTE that if you do this,"
     8661#       echo "you might have more than one version of the netcdf library on your system,"
     8662#       echo "built with differnt compilers, which can get confusing.  If you do this,"
     8663#       echo "you will have to specify the path to the (new) version of nc-config"
     8664#       echo "that was compiled using the $CC compiler by configuring ncview in a "
     8665#       echo "way similar to this:"
     8666#       echo " "
     8667#       echo "   ./configure --with-nc-config=/path/to/newly/compiled/nc-config"
     8668#       echo " "
     8669#       echo "2) Configure ncview to use the $NETCDF_CC compiler."
     8670#       echo "To do this, set environmental variable CC to $NETCDF_CC"
     8671#       echo "and run ./configure again"
     8672#       echo "==================================================================="
     8673#       exit -1
     8674#fi
    86748675
    86758676#----------------------------------------------------------------------------------
    86768677# Construct our RPATH flags.  Idea here is that we have LDFLAGS that might look,