X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=configure.ac;h=60223ee6dd3c86b3466e551880d32f30f4acf81a;hb=cf37058d7c5ba3560e86e40244556b58e4349e8c;hp=a7ab3c44251b7a04bd51b207985a2e1a36242dc9;hpb=74626a17dbd10def4af431bf704abf33dc38fea7;p=openjpeg.git diff --git a/configure.ac b/configure.ac index a7ab3c44..60223ee6 100644 --- a/configure.ac +++ b/configure.ac @@ -9,18 +9,10 @@ m4_define([OPJ_MAJOR], [1]) m4_define([OPJ_MINOR], [4]) m4_define([OPJ_MICRO], [0]) -m4_define([JP3D_MAJOR], [1]) -m4_define([JP3D_MINOR], [3]) -m4_define([JP3D_MICRO], [0]) - m4_define([lt_cur], m4_eval(OPJ_MAJOR + OPJ_MINOR)) m4_define([lt_rev], OPJ_MICRO) m4_define([lt_age], OPJ_MINOR) -m4_define([lt_cur_jp3d], m4_eval(JP3D_MAJOR + JP3D_MINOR)) -m4_define([lt_rev_jp3d], JP3D_MICRO) -m4_define([lt_age_jp3d], JP3D_MINOR) - AC_PREREQ([2.62]) AC_INIT([OpenJPEG], [OPJ_MAJOR.OPJ_MINOR.OPJ_MICRO], @@ -34,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 @@ -44,22 +36,12 @@ AC_SUBST(MAJOR_NR) AC_SUBST(MINOR_NR) AC_SUBST(MICRO_NR) -JP3D_MAJOR_NR=JP3D_MAJOR -JP3D_MINOR_NR=JP3D_MINOR -JP3D_MICRO_NR=JP3D_MICRO -AC_SUBST(JP3D_MAJOR_NR) -AC_SUBST(JP3D_MINOR_NR) -AC_SUBST(JP3D_MICRO_NR) - LT_PREREQ([2.0]) LT_INIT([win32-dll]) lt_version=lt_cur:lt_rev:lt_age AC_SUBST(lt_version) -lt_version_jp3d=lt_cur_jp3d:lt_rev_jp3d:lt_age_jp3d -AC_SUBST(lt_version_jp3d) - ### Needed information @@ -140,27 +122,21 @@ fi AM_CONDITIONAL([WANT_JPWL], [test "x${want_jpwl}" = "xyes"]) -# JP3D +# JPIP -AC_ARG_ENABLE([jp3d], - [AC_HELP_STRING([--enable-jp3d], [build jp3d library @<:@default=disabled@:>@])], +AC_ARG_ENABLE([jpip], + [AC_HELP_STRING([--enable-jpip], [build jpip library @<:@default=disabled@:>@])], [ if test "x${enableval}" = "xyes" ; then - want_jp3d="yes" + want_jpip="yes" else - want_jp3d="no" + want_jpip="no" fi ], - [want_jp3d="no"]) + [want_jpip="no"]) -AC_MSG_CHECKING([whether to build the JP3D library]) -AC_MSG_RESULT([${want_jp3d}]) - -if test "x${want_jp3d}" = "xyes" ; then - AC_DEFINE(USE_JP3D, [1], [define to 1 if you use jp3d]) -fi - -AM_CONDITIONAL([WANT_JP3D], [test "x${want_jp3d}" = "xyes"]) +AC_MSG_CHECKING([whether to build the JPIP library]) +AC_MSG_RESULT([${want_jpip}]) ### Checks for programs @@ -228,26 +204,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"], @@ -269,7 +226,7 @@ fi AM_CONDITIONAL([with_libpng], [test x${have_libpng} = "xyes"]) -#libtiff +# libtiff have_libtiff="no" @@ -289,31 +246,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 @@ -328,14 +267,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@:>@])], @@ -410,7 +345,30 @@ 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 @@ -426,6 +384,7 @@ AC_HEADER_DIRENT ### Checks for compiler characteristics +AM_PROG_CC_C_O AC_C_BIGENDIAN #OPJ_COMPILER_FLAG([-Wall]) @@ -451,13 +410,18 @@ AC_CONFIG_FILES([ Makefile libopenjpeg1.pc libopenjpeg/Makefile -jpwl/Makefile -codec/Makefile -mj2/Makefile +libopenjpeg/jpwl/Makefile +applications/Makefile +applications/codec/Makefile +applications/mj2/Makefile +applications/jpip/Makefile +applications/jpip/libopenjpip/Makefile +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 -jp3d/Makefile -jp3d/libjp3dvm/Makefile -jp3d/codec/Makefile ]) AC_OUTPUT @@ -486,5 +450,5 @@ echo " Build.............: make doc" echo echo " mj2.................: ${want_mj2}" echo " jpwl................: ${want_jpwl}" -echo " jp3d................: ${want_jp3d}" +echo " jpip................: ${want_jpip}" echo