patch-configure_in 1.6 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344
  1. --- SDL_image-1.2.12.orig/configure.in 2012-01-21 02:51:33.000000000 +0100
  2. +++ SDL_image-1.2.12/configure.in 2014-06-30 16:37:34.153488935 +0200
  3. @@ -202,27 +202,6 @@ if test "x$enable_png" = xyes; then
  4. ])
  5. if test x$have_png_hdr = xyes -a x$have_png_lib = xyes; then
  6. AC_DEFINE([LOAD_PNG])
  7. -
  8. - case "$host" in
  9. - *-*-darwin*)
  10. - png_lib=[`find_lib libpng.dylib`]
  11. - ;;
  12. - *-*-cygwin* | *-*-mingw32*)
  13. - png_lib=[`find_lib "libpng*.dll"`]
  14. - ;;
  15. - *)
  16. - png_lib=[`find_lib "libpng.so.[0-9]"`]
  17. - if test x$png_lib = x; then
  18. - png_lib=[`find_lib "libpng.so.[0-9]*"`]
  19. - fi
  20. - if test x$png_lib = x; then
  21. - png_lib=[`find_lib "libpng*.so.[0-9]"`]
  22. - fi
  23. - if test x$png_lib = x; then
  24. - png_lib=[`find_lib "libpng*.so.[0-9]*"`]
  25. - fi
  26. - ;;
  27. - esac
  28. else
  29. AC_MSG_WARN([*** Unable to find PNG library (http://www.libpng.org/pub/png/libpng.html)])
  30. AC_MSG_WARN([PNG image loading disabled])
  31. @@ -359,12 +338,7 @@ if test x$enable_jpg = xyes -a x$have_jp
  32. fi
  33. fi
  34. if test x$enable_png = xyes -a x$have_png_hdr = xyes -a x$have_png_lib = xyes; then
  35. - if test x$enable_png_shared = xyes && test x$png_lib != x; then
  36. - echo "-- dynamic libpng -> $png_lib"
  37. - AC_DEFINE_UNQUOTED(LOAD_PNG_DYNAMIC, "$png_lib")
  38. - else
  39. - IMG_LIBS="-lpng -lz $IMG_LIBS"
  40. - fi
  41. + IMG_LIBS="-lpng -lz $IMG_LIBS"
  42. fi
  43. LIBS="$saved_LIBS"