[1.5] fix output when --disable-shared or --disable-static is

      passed to configure. Minor fix for jpwl compilation.

diff --git a/CHANGES b/CHANGES
index 70fb84da3b46dcd20d3df6c5f37d5a8c7e108752..f08a0fef6a06d50a4d94248c96096a89f6b744ac 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,9 @@ What's New for OpenJPEG
 ! : changed
 + : added
 
+October 1, 2011
++ [vincent] fix output when --disable-shared or --disable-static is passed to configure. Minor fix for jpwl compilation.
+
 September 9, 2011
 + [antonin] added a new indexer functionality to the library. With the new '-jpip' option at encoding, the user can now generate a JP2 file including an XML box with the index used when browsing the image with JPIP. 
 

diff --git a/applications/jpip/libopenjpip/Makefile.am b/applications/jpip/libopenjpip/Makefile.am
index fbdffda4d81797dead3ac999329bfc6a001295c4..e86f6e15559e53558cd05a2948fc02d2b34e0d0e 100644 (file)
--- a/applications/jpip/libopenjpip/Makefile.am
+++ b/applications/jpip/libopenjpip/Makefile.am
@@ -62,11 +62,19 @@ libopenjpip_local_la_SOURCES = $(JPIP_SRC)
 
 install-data-hook:
        @echo -e " (LA)\t$(libdir)/libopenjpip_server.la" >> $(top_builddir)/report.txt
+if BUILD_SHARED
        @( $(call solist_s) ) >> $(top_builddir)/report.txt
+endif
+if BUILD_STATIC
        @echo -e " (A)\t$(base_s)/$(a_s)" >> $(top_builddir)/report.txt
+endif
        @echo -e " (LA)\t$(libdir)/libopenjpip_local.la" >> $(top_builddir)/report.txt
+if BUILD_SHARED
        @( $(call solist_c) ) >> $(top_builddir)/report.txt
+endif
+if BUILD_STATIC
        @echo -e " (A)\t$(base_c)/$(a_c)" >> $(top_builddir)/report.txt
+endif
 
 solist_s    = $(foreach f, $(dll_s) $(so_s), echo -e ' $(SO_PREFIX)\t$(base_s)/$(f)' ;)
 get_tok_s   = $(shell grep -E "^$(1)=" libopenjpip_server.la | cut -d "'" -f 2)

diff --git a/configure.ac b/configure.ac
index 5cdf640b424f854f996bbb1597ec07988130a1e5..f1e68b3110c24702a36b9c13f8df96c6cf63ea61 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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
@@ -397,6 +393,13 @@ 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

diff --git a/libopenjpeg/Makefile.am b/libopenjpeg/Makefile.am
index 4c160e08c23d2db5eb8420dc9894b0d73e1a95a4..23a94b145d78574005a1be1da084f75b847caf99 100644 (file)
--- a/libopenjpeg/Makefile.am
+++ b/libopenjpeg/Makefile.am
@@ -78,8 +78,12 @@ install-data-hook:
                  openjpeg.h
        @rm -rf $(top_builddir)/report.txt
        @echo -e " (LA)\t$(libdir)/libopenjpeg.la" >> $(top_builddir)/report.txt
+if BUILD_SHARED
        @( $(call solist) ) >> $(top_builddir)/report.txt
+endif
+if BUILD_STATIC
        @echo -e " (A)\t$(base)/$(a)" >> $(top_builddir)/report.txt
+endif
        @echo -e " (H)\t$(includedir)/openjpeg-$(MAJOR_NR).$(MINOR_NR)/openjpeg.h" >> $(top_builddir)/report.txt
        @echo -e " (LN)\t$(includedir)/openjpeg.h" >> $(top_builddir)/report.txt
 

diff --git a/libopenjpeg/jpwl/Makefile.am b/libopenjpeg/jpwl/Makefile.am
index 8677a39928c358d84c99481970f71b2edb647def..f1eda3103ca0bd05dc820dbb7411685a57e06bfa 100644 (file)
--- a/libopenjpeg/jpwl/Makefile.am
+++ b/libopenjpeg/jpwl/Makefile.am
@@ -26,7 +26,7 @@ OPJ_SRC = \
 ../phix_manager.c \
 ../ppix_manager.c \
 ../thix_manager.c \
-../tpix_manager.c 
+../tpix_manager.c
 
 libopenjpeg_JPWL_la_CPPFLAGS = \
 -I. \
@@ -50,8 +50,12 @@ rs.h
 
 install-data-hook:
        @echo -e " (LA)\t$(libdir)/libopenjpeg_JPWL.la" >> $(top_builddir)/report.txt
+if BUILD_SHARED
        @( $(call solist) ) >> $(top_builddir)/report.txt
+endif
+if BUILD_STATIC
        @echo -e " (A)\t$(base)/$(a)" >> $(top_builddir)/report.txt
+endif
 
 solist    = $(foreach f, $(dll) $(so), echo -e ' $(SO_PREFIX)\t$(base)/$(f)' ;)
 get_tok   = $(shell grep -E "^$(1)=" $(lib_LTLIBRARIES) | cut -d "'" -f 2)