[1.5] libcurl dep, fix 'distcheck' rule.

diff --git a/CHANGES b/CHANGES
index 1c7d77461cb8c3fc2f2d8099722db42253470d58..eedf8153e21aa1fb6404f6ba62393ba85da8dad7 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,9 @@ What's New for OpenJPEG
 ! : changed
 + : added
 
+November 16, 2011
+* [vincent] fix compilation of libopenjpip (libcurl dependency) and fix 'distcheck' rule
+
 October 21, 2011
 * [mickael] remove one obvious memory leak from test functions
 ! [kaori]   change -v option was renamed to -u, which is equivalent to -TP long option

diff --git a/applications/jpip/libopenjpip/Makefile.am b/applications/jpip/libopenjpip/Makefile.am
index 68a72576b0e7a8d2aad313b16b90f580c100f426..ce9c119529a82f784bd8ad9b8aaaa208f2265d50 100644 (file)
--- a/applications/jpip/libopenjpip/Makefile.am
+++ b/applications/jpip/libopenjpip/Makefile.am
@@ -29,6 +29,7 @@ target_manager.c \
 cachemodel_manager.c \
 j2kheader_manager.c \
 jp2k_encoder.c \
+openjpip.h \
 bool.h \
 boxheader_manager.h \
 box_manager.h \
@@ -51,7 +52,8 @@ jp2k_encoder.h \
 query_parser.h \
 channel_manager.h \
 session_manager.h \
-jpip_parser.h
+jpip_parser.h \
+jp2k_decoder.h
 
 LOCAL_SRC = jp2k_decoder.c \
 imgsock_manager.c \
@@ -68,9 +70,10 @@ libopenjpip_server_la_CPPFLAGS = \
 -I$(top_srcdir)/applications/jpip/libopenjpip \
 -I$(top_builddir)/applications/jpip/libopenjpip \
 @FCGI_CFLAGS@ \
+@LIBCURL_CFLAGS@ \
 -DSERVER
 libopenjpip_server_la_CFLAGS =
-libopenjpip_server_la_LIBADD = @FCGI_LIBS@ -lm
+libopenjpip_server_la_LIBADD = @FCGI_LIBS@ @LIBCURL_LIBS@ -lm
 libopenjpip_server_la_LDFLAGS = -no-undefined -version-info @lt_version@
 libopenjpip_server_la_SOURCES = $(JPIP_SRC)
 
@@ -79,9 +82,10 @@ libopenjpip_local_la_CPPFLAGS = \
 -I$(top_srcdir)/libopenjpeg \
 -I$(top_builddir)/libopenjpeg \
 -I$(top_srcdir)/applications/jpip/libopenjpip \
--I$(top_builddir)/applications/jpip/libopenjpip
+-I$(top_builddir)/applications/jpip/libopenjpip \
+@LIBCURL_CFLAGS@
 libopenjpip_local_la_CFLAGS =
-libopenjpip_local_la_LIBADD = $(top_builddir)/libopenjpeg/libopenjpeg.la -lm
+libopenjpip_local_la_LIBADD = @LIBCURL_LIBS@ $(top_builddir)/libopenjpeg/libopenjpeg.la -lm
 libopenjpip_local_la_LDFLAGS = -no-undefined -version-info @lt_version@
 libopenjpip_local_la_SOURCES = $(JPIP_SRC) $(LOCAL_SRC)
 

diff --git a/applications/jpip/util/Makefile.am b/applications/jpip/util/Makefile.am
index 9e439d9bdbc9d7efc52634406ca9447ff48b292f..7ed8b9fb333a151ec2c48427323fdfa90ff5b44a 100644 (file)
--- a/applications/jpip/util/Makefile.am
+++ b/applications/jpip/util/Makefile.am
@@ -6,14 +6,14 @@ opj_server_CPPFLAGS = \
 @FCGI_CFLAGS@ \
 -I. \
 -I$(top_srcdir)/applications/jpip/libopenjpip \
--I$(top_builddir)/applications/jpip/libopenjpip
-#
-opj_server_CFLAGS = -DServer -DQUIT_SIGNAL=\"quitJPIP\"
+-I$(top_builddir)/applications/jpip/libopenjpip \
+-DServer \
+-DQUIT_SIGNAL=\"quitJPIP\"
 #
 opj_server_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_server.la @FCGI_LIBS@ -lm
 #
-opj_server_SOURCES = \
-opj_server.c
+opj_server_SOURCES = opj_server.c
+
 #-------------
 opj_dec_server_CPPFLAGS = \
 -I. \
@@ -23,6 +23,7 @@ opj_dec_server_CPPFLAGS = \
 opj_dec_server_CFLAGS =
 opj_dec_server_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_local.la
 opj_dec_server_SOURCES = opj_dec_server.c
+
 #-------------
 jpip_to_jp2_CPPFLAGS = \
 -I. \
@@ -32,6 +33,7 @@ jpip_to_jp2_CPPFLAGS = \
 jpip_to_jp2_CFLAGS =
 jpip_to_jp2_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_local.la
 jpip_to_jp2_SOURCES = jpip_to_jp2.c
+
 #-------------
 jpip_to_j2k_CPPFLAGS = \
 -I. \
@@ -41,6 +43,7 @@ jpip_to_j2k_CPPFLAGS = \
 jpip_to_j2k_CFLAGS =
 jpip_to_j2k_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_local.la
 jpip_to_j2k_SOURCES = jpip_to_j2k.c
+
 #-------------
 test_index_CPPFLAGS = \
 -I. \
@@ -50,6 +53,7 @@ test_index_CPPFLAGS = \
 test_index_CFLAGS =
 test_index_LDADD = $(top_builddir)/applications/jpip/libopenjpip/libopenjpip_local.la
 test_index_SOURCES = test_index.c
+
 #-------------
 install-data-hook:
        @echo -e " (B)\t$(bindir)/opj_server$(EXEEXT)" >> $(top_builddir)/report.txt

diff --git a/configure.ac b/configure.ac
index defc6c083f6218e90de94bbb0452938752555aa7..cef24a518d6cf7f17a7e19408b899db357fe9634 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -351,6 +351,21 @@ if test "x${want_jpip}" = "xyes" ; then
 
 fi
 
+# libcurl
+
+if test "x${want_jpip}" = "xyes" ; then
+
+   PKG_CHECK_MODULES([LIBCURL], [libcurl],
+      [have_libcurl="yes"],
+      [have_libcurl="no"])
+
+   if ! test "x${have_libcurl}" = "xyes" ; then
+      AC_MSG_WARN([libcurl 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