configure
changeset 491 4088a517f9a5
parent 487 20954174d833
child 524 b4b49635cbd8
     1.1 --- a/configure	Mon Feb 15 08:42:35 2016 -0800
     1.2 +++ b/configure	Mon Feb 15 08:44:43 2016 -0800
     1.3 @@ -12795,7 +12795,10 @@
     1.4  $as_echo "no" >&6; }
     1.5                          ac_fn_c_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default"
     1.6  if test "x$ac_cv_header_png_h" = xyes; then :
     1.7 -  have_png_hdr=yes
     1.8 +
     1.9 +            have_png_hdr=yes
    1.10 +            LIBPNG_CFLAGS=""
    1.11 +
    1.12  fi
    1.13  
    1.14  
    1.15 @@ -12836,14 +12839,20 @@
    1.16  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_create_read_struct" >&5
    1.17  $as_echo "$ac_cv_lib_png_png_create_read_struct" >&6; }
    1.18  if test "x$ac_cv_lib_png_png_create_read_struct" = xyes; then :
    1.19 -  have_png_lib=yes
    1.20 +
    1.21 +            have_png_lib=yes
    1.22 +            LIBPNG_LIBS="-lpng -lz"
    1.23 +
    1.24  fi
    1.25  
    1.26  
    1.27  elif test $pkg_failed = untried; then
    1.28  	        ac_fn_c_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default"
    1.29  if test "x$ac_cv_header_png_h" = xyes; then :
    1.30 -  have_png_hdr=yes
    1.31 +
    1.32 +            have_png_hdr=yes
    1.33 +            LIBPNG_CFLAGS=""
    1.34 +
    1.35  fi
    1.36  
    1.37  
    1.38 @@ -12884,7 +12893,10 @@
    1.39  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_create_read_struct" >&5
    1.40  $as_echo "$ac_cv_lib_png_png_create_read_struct" >&6; }
    1.41  if test "x$ac_cv_lib_png_png_create_read_struct" = xyes; then :
    1.42 -  have_png_lib=yes
    1.43 +
    1.44 +            have_png_lib=yes
    1.45 +            LIBPNG_LIBS="-lpng -lz"
    1.46 +
    1.47  fi
    1.48  
    1.49  
    1.50 @@ -12894,7 +12906,6 @@
    1.51          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
    1.52  $as_echo "yes" >&6; }
    1.53  	        have_png_hdr=yes
    1.54 -        CFLAGS="$LIBPNG_CFLAGS $CFLAGS"
    1.55          have_png_lib=yes
    1.56  
    1.57  fi
    1.58 @@ -13061,7 +13072,10 @@
    1.59  $as_echo "no" >&6; }
    1.60                          ac_fn_c_check_header_mongrel "$LINENO" "webp/decode.h" "ac_cv_header_webp_decode_h" "$ac_includes_default"
    1.61  if test "x$ac_cv_header_webp_decode_h" = xyes; then :
    1.62 -  have_webp_hdr=yes
    1.63 +
    1.64 +            have_webp_hdr=yes
    1.65 +            LIBWEBP_CFLAGS=""
    1.66 +
    1.67  fi
    1.68  
    1.69  
    1.70 @@ -13102,14 +13116,20 @@
    1.71  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_webp_WebPGetDecoderVersion" >&5
    1.72  $as_echo "$ac_cv_lib_webp_WebPGetDecoderVersion" >&6; }
    1.73  if test "x$ac_cv_lib_webp_WebPGetDecoderVersion" = xyes; then :
    1.74 -  have_webp_lib=yes
    1.75 +
    1.76 +            have_webp_lib=yes
    1.77 +            LIBWEBP_LIBS="-lwebp"
    1.78 +
    1.79  fi
    1.80  
    1.81  
    1.82  elif test $pkg_failed = untried; then
    1.83  	        ac_fn_c_check_header_mongrel "$LINENO" "webp/decode.h" "ac_cv_header_webp_decode_h" "$ac_includes_default"
    1.84  if test "x$ac_cv_header_webp_decode_h" = xyes; then :
    1.85 -  have_webp_hdr=yes
    1.86 +
    1.87 +            have_webp_hdr=yes
    1.88 +            LIBWEBP_CFLAGS=""
    1.89 +
    1.90  fi
    1.91  
    1.92  
    1.93 @@ -13150,7 +13170,10 @@
    1.94  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_webp_WebPGetDecoderVersion" >&5
    1.95  $as_echo "$ac_cv_lib_webp_WebPGetDecoderVersion" >&6; }
    1.96  if test "x$ac_cv_lib_webp_WebPGetDecoderVersion" = xyes; then :
    1.97 -  have_webp_lib=yes
    1.98 +
    1.99 +            have_webp_lib=yes
   1.100 +            LIBWEBP_LIBS="-lwebp"
   1.101 +
   1.102  fi
   1.103  
   1.104  
   1.105 @@ -13160,7 +13183,6 @@
   1.106          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
   1.107  $as_echo "yes" >&6; }
   1.108  	        have_webp_hdr=yes
   1.109 -        CFLAGS="$LIBWEBP_CFLAGS $CFLAGS"
   1.110          have_webp_lib=yes
   1.111  
   1.112  fi
   1.113 @@ -13236,6 +13258,7 @@
   1.114  fi
   1.115  
   1.116  if test x$enable_webp = xyes -a x$have_webp_hdr = xyes -a x$have_webp_lib = xyes; then
   1.117 +    CFLAGS="$LIBWEBP_CFLAGS $CFLAGS"
   1.118      if test x$enable_webp_shared = xyes && test x$webp_lib != x; then
   1.119          echo "-- dynamic libwebp -> $webp_lib"
   1.120          cat >>confdefs.h <<_ACEOF
   1.121 @@ -13243,7 +13266,7 @@
   1.122  _ACEOF
   1.123  
   1.124      else
   1.125 -        IMG_LIBS="-lwebp $IMG_LIBS"
   1.126 +        IMG_LIBS="$LIBWEBP_LIBS $IMG_LIBS"
   1.127      fi
   1.128  fi
   1.129  
   1.130 @@ -13274,6 +13297,7 @@
   1.131      fi
   1.132  fi
   1.133  if test x$enable_png = xyes -a x$have_png_hdr = xyes -a x$have_png_lib = xyes; then
   1.134 +    CFLAGS="$LIBPNG_CFLAGS $CFLAGS"
   1.135      if test x$enable_png_shared = xyes && test x$png_lib != x; then
   1.136          echo "-- dynamic libpng -> $png_lib"
   1.137          cat >>confdefs.h <<_ACEOF
   1.138 @@ -13281,7 +13305,7 @@
   1.139  _ACEOF
   1.140  
   1.141      else
   1.142 -        IMG_LIBS="-lpng -lz $IMG_LIBS"
   1.143 +        IMG_LIBS="$LIBPNG_LIBS $IMG_LIBS"
   1.144      fi
   1.145  fi
   1.146