# 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))
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
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],
if test "x${want_lcms2}" = "xyes" ; then
PKG_CHECK_MODULES([LCMS2], [lcms2],
- [
- have_lcms2="yes"
- requirements="lcms2"
- ],
+ [have_lcms2="yes"],
[have_lcms2="no"])
fi
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
### 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
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
+applications/jpip/util/Makefile
doc/Makefile
])