diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | applications/jpip/libopenjpip/Makefile.am | 2 | ||||
| -rw-r--r-- | applications/jpip/util/Makefile.am | 10 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | doc/Makefile.am | 2 | ||||
| -rw-r--r-- | libopenjpeg/Makefile.am | 2 | ||||
| -rw-r--r-- | libopenjpeg/openjpeg.c | 2 | ||||
| -rw-r--r-- | libopenjpeg/opj_stdint.h | 4 | ||||
| -rw-r--r-- | opj_config.h.cmake.in | 2 |
9 files changed, 25 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 6ed452f5..6d841ae8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -34,7 +34,6 @@ CMake/OpenJPEGConfig.cmake.in \ CMakeLists.txt \ CTestConfig.cmake \ AUTHORS \ -CHANGES \ INSTALL \ LICENSE \ NEWS \ diff --git a/applications/jpip/libopenjpip/Makefile.am b/applications/jpip/libopenjpip/Makefile.am index cfc973c4..6def5d6f 100644 --- a/applications/jpip/libopenjpip/Makefile.am +++ b/applications/jpip/libopenjpip/Makefile.am @@ -80,6 +80,8 @@ dec_clientmsg_handler.h libopenjpip_server_la_CPPFLAGS = \ -I. \ +-I$(top_srcdir)/libopenjpeg \ +-I$(top_builddir)/libopenjpeg \ -I$(top_srcdir)/applications/jpip/libopenjpip \ -I$(top_builddir)/applications/jpip/libopenjpip \ @FCGI_CFLAGS@ \ diff --git a/applications/jpip/util/Makefile.am b/applications/jpip/util/Makefile.am index eac0e6a6..0e98b71e 100644 --- a/applications/jpip/util/Makefile.am +++ b/applications/jpip/util/Makefile.am @@ -13,6 +13,8 @@ endif opj_server_CPPFLAGS = \ @FCGI_CFLAGS@ \ -I. \ +-I$(top_srcdir)/libopenjpeg \ +-I$(top_builddir)/libopenjpeg \ -I$(top_srcdir)/applications/jpip/libopenjpip \ -I$(top_builddir)/applications/jpip/libopenjpip \ -DSERVER \ @@ -25,6 +27,8 @@ opj_server_SOURCES = opj_server.c #------------- opj_dec_server_CPPFLAGS = \ -I. \ +-I$(top_srcdir)/libopenjpeg \ +-I$(top_builddir)/libopenjpeg \ -I$(top_srcdir)/applications/jpip/libopenjpip \ -I$(top_builddir)/applications/jpip/libopenjpip # @@ -35,6 +39,8 @@ opj_dec_server_SOURCES = opj_dec_server.c #------------- jpip_to_jp2_CPPFLAGS = \ -I. \ +-I$(top_srcdir)/libopenjpeg \ +-I$(top_builddir)/libopenjpeg \ -I$(top_srcdir)/applications/jpip/libopenjpip \ -I$(top_builddir)/applications/jpip/libopenjpip # @@ -45,6 +51,8 @@ jpip_to_jp2_SOURCES = jpip_to_jp2.c #------------- jpip_to_j2k_CPPFLAGS = \ -I. \ +-I$(top_srcdir)/libopenjpeg \ +-I$(top_builddir)/libopenjpeg \ -I$(top_srcdir)/applications/jpip/libopenjpip \ -I$(top_builddir)/applications/jpip/libopenjpip # @@ -55,6 +63,8 @@ jpip_to_j2k_SOURCES = jpip_to_j2k.c #------------- test_index_CPPFLAGS = \ -I. \ +-I$(top_srcdir)/libopenjpeg \ +-I$(top_builddir)/libopenjpeg \ -I$(top_srcdir)/applications/jpip/libopenjpip \ -I$(top_builddir)/applications/jpip/libopenjpip # diff --git a/configure.ac b/configure.ac index 283123e3..fa08d7f1 100644 --- a/configure.ac +++ b/configure.ac @@ -59,7 +59,11 @@ esac AM_CONDITIONAL([HAVE_WIN32], [test "x${have_win32}" = "xyes"]) AM_CONDITIONAL([HAVE_DARWIN], [test "x${have_darwin}" = "xyes"]) - +AC_TYPE_SSIZE_T +if test "x$ac_cv_type_ssize_t" = xyes; then +AC_DEFINE([HAVE_SSIZE_T], [1],[Define to 1 if you have ssize_t.], + [AC_MSG([ssize_t not found])]) +fi ### Additional options to configure # debug diff --git a/doc/Makefile.am b/doc/Makefile.am index d4b8056f..9e62a65c 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -34,7 +34,7 @@ doc: endif docsdir = $(docdir)-$(MAJOR_NR).$(MINOR_NR) -docs_DATA = $(top_builddir)/LICENSE $(top_builddir)/CHANGES +docs_DATA = $(top_builddir)/LICENSE dist_man1_MANS = \ man/man1/image_to_j2k.1 \ diff --git a/libopenjpeg/Makefile.am b/libopenjpeg/Makefile.am index 0c551e0c..3397c923 100644 --- a/libopenjpeg/Makefile.am +++ b/libopenjpeg/Makefile.am @@ -7,7 +7,7 @@ SUBDIRS += jpwl endif includesdir = $(includedir)/openjpeg-$(MAJOR_NR).$(MINOR_NR) -includes_HEADERS = openjpeg.h +includes_HEADERS = openjpeg.h opj_stdint.h lib_LTLIBRARIES = libopenjpeg.la diff --git a/libopenjpeg/openjpeg.c b/libopenjpeg/openjpeg.c index bffd44dc..a4c5cb99 100644 --- a/libopenjpeg/openjpeg.c +++ b/libopenjpeg/openjpeg.c @@ -220,7 +220,7 @@ DllMain(HANDLE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) { const char* OPJ_CALLCONV opj_version(void) { - return OPJ_PACKAGE_VERSION; + return PACKAGE_VERSION; } diff --git a/libopenjpeg/opj_stdint.h b/libopenjpeg/opj_stdint.h index 36731167..3dd2ec2b 100644 --- a/libopenjpeg/opj_stdint.h +++ b/libopenjpeg/opj_stdint.h @@ -49,8 +49,12 @@ typedef size_t OPJ_SIZE_T; typedef int64_t OPJ_OFF_T; #ifndef HAVE_SSIZE_T +#if defined(_WIN32) #include <BaseTsd.h> typedef SSIZE_T ssize_t; +#else +#error SSIZE_T is undefined +#endif /* _WIN32 */ #endif #endif /* OPJ_STDINT_H */ diff --git a/opj_config.h.cmake.in b/opj_config.h.cmake.in index e5ac38e4..b57adb74 100644 --- a/opj_config.h.cmake.in +++ b/opj_config.h.cmake.in @@ -1,5 +1,5 @@ /* create config.h for CMake */ -#define OPJ_PACKAGE_VERSION "@PACKAGE_VERSION@" +#define PACKAGE_VERSION "@PACKAGE_VERSION@" #cmakedefine HAVE_INTTYPES_H @HAVE_INTTYPES_H@ #cmakedefine HAVE_MEMORY_H @HAVE_MEMORY_H@ |