common/autoconf/libraries.m4

*** 652,661 ****
--- 652,701 ----
    fi
    AC_SUBST(USE_EXTERNAL_LIBGIF)
  
    ###############################################################################
    #
+   # Check for the png library
+   #
+ 
+   AC_ARG_WITH(libpng, [AS_HELP_STRING([--with-libpng],
+      [use libpng from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])])
+ 
+   AC_CHECK_LIB(png, png_sig_cmp,
+                [ LIBPNG_FOUND=yes ],
+                [ LIBPNG_FOUND=no ])
+ 
+   AC_MSG_CHECKING([for which libpng to use])
+ 
+   # default is bundled
+   DEFAULT_LIBPNG=bundled
+ 
+   #
+   # if user didn't specify, use DEFAULT_LIBPNG
+   #
+   if test "x${with_libpng}" = "x"; then
+       with_libpng=${DEFAULT_libpng}
+   fi
+ 
+   if test "x${with_libpng}" = "xbundled"; then
+       USE_EXTERNAL_LIBPNG=false
+       AC_MSG_RESULT([bundled])
+   elif test "x${with_libpng}" = "xsystem"; then
+       if test "x${LIBPNG_FOUND}" = "xyes"; then
+           USE_EXTERNAL_LIBPNG=true
+           AC_MSG_RESULT([system])
+       else
+           AC_MSG_RESULT([system not found])
+           AC_MSG_ERROR([--with-libpng=system specified, but no libpng found!])
+       fi
+   else
+       AC_MSG_ERROR([Invalid value of --with-libpng: ${with_libpng}, use 'system' or 'bundled'])
+   fi
+   AC_SUBST(USE_EXTERNAL_LIBPNG)
+ 
+   ###############################################################################
+   #
    # Check for the zlib library
    #
  
    AC_ARG_WITH(zlib, [AS_HELP_STRING([--with-zlib],
        [use zlib from build system or OpenJDK source (system, bundled) @<:@bundled@:>@])])