common/autoconf/generated-configure.sh

*** 644,653 ****
--- 644,654 ----
  STATIC_CXX_SETTING
  LIBDL
  LIBM
  LIBZIP_CAN_USE_MMAP
  USE_EXTERNAL_LIBZ
+ USE_EXTERNAL_LIBPNG
  USE_EXTERNAL_LIBGIF
  USE_EXTERNAL_LIBJPEG
  ALSA_LIBS
  ALSA_CFLAGS
  FREETYPE_BUNDLE_LIB_PATH
*** 1066,1075 ****
--- 1067,1077 ----
  enable_freetype_bundling
  with_alsa
  with_alsa_include
  with_alsa_lib
  with_giflib
+ with_libpng
  with_zlib
  with_stdc__lib
  with_num_cores
  with_memory_size
  with_jobs
*** 1914,1923 ****
--- 1916,1927 ----
                            headers under PATH/include)
    --with-alsa-include     specify directory for the alsa include files
    --with-alsa-lib         specify directory for the alsa library
    --with-giflib           use giflib from build system or OpenJDK source
                            (system, bundled) [bundled]
+   --with-libpng           use libpng from build system or OpenJDK source
+                           (system, bundled) [bundled]
    --with-zlib             use zlib from build system or OpenJDK source
                            (system, bundled) [bundled]
    --with-stdc++lib=<static>,<dynamic>,<default>
                            force linking of the C++ runtime on Linux to either
                            static or dynamic, default is static with dynamic as
*** 4085,4095 ****
  # definitions. It is replaced with custom functionality when building
  # custom sources.
  #CUSTOM_AUTOCONF_INCLUDE
  
  # Do not change or remove the following line, it is needed for consistency checks:
! DATE_WHEN_GENERATED=1391160222
  
  ###############################################################################
  #
  # Initialization / Boot-strapping
  #
--- 4089,4099 ----
  # definitions. It is replaced with custom functionality when building
  # custom sources.
  #CUSTOM_AUTOCONF_INCLUDE
  
  # Do not change or remove the following line, it is needed for consistency checks:
! DATE_WHEN_GENERATED=1391446004
  
  ###############################################################################
  #
  # Initialization / Boot-strapping
  #
*** 47193,47202 ****
--- 47197,47293 ----
    fi
  
  
    ###############################################################################
    #
+   # Check for the png library
+   #
+ 
+ 
+ # Check whether --with-libpng was given.
+ if test "${with_libpng+set}" = set; then :
+   withval=$with_libpng;
+ fi
+ 
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_sig_cmp in -lpng" >&5
+ $as_echo_n "checking for png_sig_cmp in -lpng... " >&6; }
+ if ${ac_cv_lib_png_png_sig_cmp+:} false; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpng  $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+    Use char because int might match the return type of a GCC
+    builtin and then its argument prototype would still apply.  */
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+ char png_sig_cmp ();
+ int
+ main ()
+ {
+ return png_sig_cmp ();
+   ;
+   return 0;
+ }
+ _ACEOF
+ if ac_fn_cxx_try_link "$LINENO"; then :
+   ac_cv_lib_png_png_sig_cmp=yes
+ else
+   ac_cv_lib_png_png_sig_cmp=no
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+     conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_sig_cmp" >&5
+ $as_echo "$ac_cv_lib_png_png_sig_cmp" >&6; }
+ if test "x$ac_cv_lib_png_png_sig_cmp" = xyes; then :
+    LIBPNG_FOUND=yes
+ else
+    LIBPNG_FOUND=no
+ fi
+ 
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for which libpng to use" >&5
+ $as_echo_n "checking for which libpng to use... " >&6; }
+ 
+   # 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
+       { $as_echo "$as_me:${as_lineno-$LINENO}: result: bundled" >&5
+ $as_echo "bundled" >&6; }
+   elif test "x${with_libpng}" = "xsystem"; then
+       if test "x${LIBPNG_FOUND}" = "xyes"; then
+           USE_EXTERNAL_LIBPNG=true
+           { $as_echo "$as_me:${as_lineno-$LINENO}: result: system" >&5
+ $as_echo "system" >&6; }
+       else
+           { $as_echo "$as_me:${as_lineno-$LINENO}: result: system not found" >&5
+ $as_echo "system not found" >&6; }
+           as_fn_error $? "--with-libpng=system specified, but no libpng found!" "$LINENO" 5
+       fi
+   else
+       as_fn_error $? "Invalid value of --with-libpng: ${with_libpng}, use 'system' or 'bundled'" "$LINENO" 5
+   fi
+ 
+ 
+   ###############################################################################
+   #
    # Check for the zlib library
    #
  
  
  # Check whether --with-zlib was given.