X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=configure.ac;h=ab80e523d685f642ce44a22efb06bb880ddf4fff;hb=ca5b10938a7528a5db58288ce5ff3694e13148a5;hp=baefa9641d73d8a5ec7dd59f14b27805fe752868;hpb=b7969ce657d5b32e0726c14af418d0ea4af55fdb;p=openjpeg.git diff --git a/configure.ac b/configure.ac index baefa964..ab80e523 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ # 3) if API or ABI is broken (this case should (must) never happen as it's very bad for a library), or a new designed library, increase MAJOR and set MINOR and MICRO to 0 m4_define([OPJ_MAJOR], [1]) -m4_define([OPJ_MINOR], [4]) +m4_define([OPJ_MINOR], [99]) m4_define([OPJ_MICRO], [0]) m4_define([lt_cur], m4_eval(OPJ_MAJOR + OPJ_MINOR)) @@ -26,7 +26,7 @@ AC_CONFIG_HEADERS([opj_config.h]) AC_CANONICAL_SYSTEM AC_CANONICAL_HOST -AM_INIT_AUTOMAKE(1.11 foreign dist-bzip2) +AM_INIT_AUTOMAKE([1.11 foreign dist-bzip2]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) MAJOR_NR=OPJ_MAJOR @@ -116,10 +116,6 @@ AC_ARG_ENABLE([jpwl], AC_MSG_CHECKING([whether to build the JPWL library]) AC_MSG_RESULT([${want_jpwl}]) -if test "x${want_jpwl}" = "xyes" ; then - AC_DEFINE(USE_JPWL, [1], [define to 1 if you use jpwl]) -fi - AM_CONDITIONAL([WANT_JPWL], [test "x${want_jpwl}" = "xyes"]) # JPIP @@ -138,41 +134,6 @@ AC_ARG_ENABLE([jpip], AC_MSG_CHECKING([whether to build the JPIP library]) AC_MSG_RESULT([${want_jpip}]) -if test "x${want_jpip}" = "xyes" ; then - AC_DEFINE(USE_JPIP, [1], [define to 1 if you use jpip]) -fi - -# libfcgi - -if test "x${want_jpip}" = "xyes" ; then - OPJ_CHECK_LIB([/usr], - [fcgi_stdio.h], - [fcgi], - [FCGI_printf], - [want_jpip="yes"], - [want_jpip="no"]) -fi - -if test "x${want_jpip}" = "xno" ; then - OPJ_CHECK_LIB([/usr/local], - [fcgi_stdio.h], - [fcgi], - [FCGI_printf], - [want_jpip="yes"], - [want_jpip="no"]) -fi - -if test "x${want_jpip}" = "xno" ; then - OPJ_CHECK_LIB([/opt], - [fcgi_stdio.h], - [fcgi], - [FCGI_printf], - [want_jpip="yes"], - [want_jpip="no"]) -fi - -AM_CONDITIONAL([WANT_JPIP], [test "x${want_jpip}" = "xyes"]) - ### Checks for programs @@ -222,13 +183,13 @@ AC_MSG_RESULT([${want_png}]) if test "x${want_png}" = "xyes" ; then - PKG_CHECK_MODULES([PNG], [libpng14], + PKG_CHECK_MODULES([PNG], [libpng15], [have_libpng="yes"], [ - PKG_CHECK_MODULES([PNG], [libpng12], + PKG_CHECK_MODULES([PNG], [libpng14], [have_libpng="yes"], [ - PKG_CHECK_MODULES([PNG], [libpng10], + PKG_CHECK_MODULES([PNG], [libpng12], [have_libpng="yes"], [ PKG_CHECK_MODULES([PNG], [libpng], @@ -239,26 +200,7 @@ if test "x${want_png}" = "xyes" ; then ]) if ! test "x${have_libpng}" = "xyes" ; then - OPJ_CHECK_LIB([/usr], - [png.h], - [png], - [png_create_write_struct], - [have_libpng="yes"], - [have_libpng="no"]) - fi - - if ! test "x${have_libpng}" = "xyes" ; then - OPJ_CHECK_LIB([/usr/local], - [png.h], - [png], - [png_create_write_struct], - [have_libpng="yes"], - [have_libpng="no"]) - fi - - if ! test "x${have_libpng}" = "xyes" ; then - OPJ_CHECK_LIB([/opt], - [png.h], + OPJ_CHECK_LIB([png.h], [png], [png_create_write_struct], [have_libpng="yes"], @@ -300,31 +242,13 @@ AC_MSG_RESULT([${want_tiff}]) if test "x${want_tiff}" = "xyes" ; then - OPJ_CHECK_LIB([/usr], + OPJ_CHECK_LIB( [tiff.h], [tiff], [TIFFOpen], [have_libtiff="yes"], [have_libtiff="no"]) - if ! test "x${have_libtiff}" = "xyes" ; then - OPJ_CHECK_LIB([/usr/local], - [tiff.h], - [tiff], - [TIFFOpen], - [have_libtiff="yes"], - [have_libtiff="no"]) - fi - - if ! test "x${have_libtiff}" = "xyes" ; then - OPJ_CHECK_LIB([/opt], - [tiff.h], - [tiff], - [TIFFOpen], - [have_libtiff="yes"], - [have_libtiff="no"]) - fi - if test "x${have_libtiff}" = "xno" ; then AC_MSG_WARN([Can not find a usuable TIFF library. Make sure that CPPFLAGS and LDFLAGS are correctly set.]) fi @@ -339,14 +263,10 @@ fi AM_CONDITIONAL([with_libtiff], [test "x${have_libtiff}" = "xyes"]) -AC_ARG_VAR([TIFF_CFLAGS], [preprocessor flags for libtiff]) -AC_SUBST(TIFF_CFLAGS) -AC_ARG_VAR([TIFF_LIBS], [linker flags for libtiff]) -AC_SUBST(TIFF_LIBS) - # libcms2 lcms_output="no" +have_lcms2="no" AC_ARG_ENABLE([lcms2], [AC_HELP_STRING([--disable-lcms2], [disable LCMS-2 support @<:@default=enabled@:>@])], @@ -364,10 +284,7 @@ AC_MSG_RESULT([${want_lcms2}]) if test "x${want_lcms2}" = "xyes" ; then PKG_CHECK_MODULES([LCMS2], [lcms2], - [ - have_lcms2="yes" - requirements="lcms2" - ], + [have_lcms2="yes"], [have_lcms2="no"]) fi @@ -399,15 +316,9 @@ if test "x${have_lcms2}" = "xno" ; then if test "x${want_lcms1}" = "xyes" ; then PKG_CHECK_MODULES([LCMS1], [lcms1], - [ - have_lcms1="yes" - requirements="lcms1" - ], + [have_lcms1="yes"], [PKG_CHECK_MODULES([LCMS1], [lcms], - [ - have_lcms1="yes" - requirements="lcms" - ], + [have_lcms1="yes"], [have_lcms1="no"])]) fi @@ -421,6 +332,31 @@ if test "x${have_lcms2}" = "xno" ; then fi +# libfcgi + +if test "x${want_jpip}" = "xyes" ; then + + have_fcgi="no" + OPJ_CHECK_LIB( + [fcgi_stdio.h], + [fcgi], + [FCGI_Accept], + [have_fcgi="yes"], + [have_fcgi="no"]) + + if ! test "x${have_fcgi}" = "xyes" ; then + AC_MSG_WARN([FastCGI library not found. OpenJPIP will not be compiled.]) + want_jpip="no" + fi + +fi + +if test "x${want_jpip}" = "xyes" ; then + AC_DEFINE(USE_JPIP, [1], [define to 1 if you use jpip]) +fi + +AM_CONDITIONAL([WANT_JPIP], [test "x${want_jpip}" = "xyes"]) + ### Checks for header files ## FIXME: declarations must be fixed in source code. See autoconf manual @@ -435,6 +371,7 @@ AC_HEADER_DIRENT ### Checks for compiler characteristics +AM_PROG_CC_C_O AC_C_BIGENDIAN #OPJ_COMPILER_FLAG([-Wall]) @@ -456,9 +393,17 @@ fi ### Checks for library functions + +### Post configuration + +AM_CONDITIONAL([BUILD_SHARED], [test "x${enable_shared}" = "xyes"]) +AM_CONDITIONAL([BUILD_STATIC], [test "x${enable_static}" = "xyes"]) + + AC_CONFIG_FILES([ Makefile libopenjpeg1.pc +libopenjpeg-jpwl.pc libopenjpeg/Makefile libopenjpeg/jpwl/Makefile applications/Makefile @@ -470,7 +415,6 @@ applications/jpip/opj_server/Makefile applications/jpip/opj_client/Makefile applications/jpip/opj_client/opj_dec_server/Makefile applications/jpip/tools/Makefile -applications/jpip/tools/indexer/Makefile doc/Makefile ])