common/autoconf/libraries.m4

Print this page

        

*** 618,632 **** ############################################################################### # # Check for the jpeg library # USE_EXTERNAL_LIBJPEG=true ! AC_CHECK_LIB(jpeg, main, [], ! [ USE_EXTERNAL_LIBJPEG=false ! AC_MSG_NOTICE([Will use jpeg decoder bundled with the OpenJDK source]) ! ]) AC_SUBST(USE_EXTERNAL_LIBJPEG) ############################################################################### # # Check for the gif library --- 618,657 ---- ############################################################################### # # Check for the jpeg library # + AC_ARG_WITH(libjpeg, [AS_HELP_STRING([--with-libjpeg], + [use libjpeg from build system or OpenJDK source (system, bundled) @<:bundled@:>@])]) + + AC_MSG_CHECKING([for which libjpeg to use]) + + # default is bundled + DEFAULT_LIBJPEG=bundled + + # + # if user didn't specify, use DEFAULT_LIBJPEG + # + if test "x${with_libjpeg}" = "x"; then + with_libjpeg=${DEFAULT_LIBJPEG} + fi + + AC_MSG_RESULT(${with_libjpeg}) + + if test "x${with_libjpeg}" = "xbundled"; then + USE_EXTERNAL_LIBJPEG=false + elif test "x${with_libjpeg}" = "xsystem"; then + AC_CHECK_HEADER(jpeglib.h, [], + [ AC_MSG_ERROR([--with-libjpeg=system specified, but jpeglib.h not found!])]) + AC_CHECK_LIB(jpeg, jpeg_CreateDecompress, [], + [ AC_MSG_ERROR([--with-libjpeg=system specified, but no libjpeg found])]) + USE_EXTERNAL_LIBJPEG=true ! else ! AC_MSG_ERROR([Invalid use of --with-libjpeg: ${with_libjpeg}, use 'system' or 'bundled']) ! fi ! AC_SUBST(USE_EXTERNAL_LIBJPEG) ############################################################################### # # Check for the gif library