From d0d65fa2d6e1256d011982fe121ad0417e9014ca Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Thu, 28 Nov 2013 15:07:03 +0100 Subject: Put thirdparty config headers in separate directories. Only -I the config header directory if building the thirdparty library, not if using the system library. Fix bug 694808. --- scripts/openjpeg/opj_config.h | 18 +++++++++++++ scripts/openjpeg/opj_config_private.h | 48 +++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 scripts/openjpeg/opj_config.h create mode 100644 scripts/openjpeg/opj_config_private.h (limited to 'scripts/openjpeg') diff --git a/scripts/openjpeg/opj_config.h b/scripts/openjpeg/opj_config.h new file mode 100644 index 00000000..647fe3b8 --- /dev/null +++ b/scripts/openjpeg/opj_config.h @@ -0,0 +1,18 @@ +/* If you want to build the library manually without using + * 'configure' or 'CMake' + * then copy this file + * 'opj_config.h.cmake.in' + * to + * 'opj_config.h' + * + * Open 'opj_config.h' and change the file contents + * if you want to define something because you know you have + * BOTH installed the library AND the header file(s). + * Then e.g. write +#define HAVE_LIBPNG 1 + * + * + * The file 'opj_config.h' will be included in some source files. + * ==== YOU CAN NOT COMPILE WITHOUT IT. ==== + * === DO NOT FORGET TO CHANGE 'config.nix' APPROPRIATELY. ==== +*/ diff --git a/scripts/openjpeg/opj_config_private.h b/scripts/openjpeg/opj_config_private.h new file mode 100644 index 00000000..70f1f6d8 --- /dev/null +++ b/scripts/openjpeg/opj_config_private.h @@ -0,0 +1,48 @@ +/* If you want to build the library manually without using + * 'configure' or 'CMake' + * then copy this file + * 'opj_config_private.h.cmake.in' + * to + * 'opj_config_private.h' + * + * Open 'opj_config_private.h' and change the file contents + * if you want to define something because you know you have + * BOTH installed the library AND the header file(s). + * Then e.g. write +#define HAVE_LIBPNG 1 + * + * + * The file 'opj_config_private.h' will be included in some source files. + * ==== YOU CAN NOT COMPILE WITHOUT IT. ==== + * === DO NOT FORGET TO CHANGE 'config.nix' APPROPRIATELY. ==== +*/ + +#ifndef _WIN32 +#define OPJ_HAVE_INTTYPES_H 1 +#else +#undef OPJ_HAVE_INTTYPES_H +#endif + +#define USE_JPIP +#define OPJ_PACKAGE_VERSION "2.0.0" + +/* DO NOT DEFINE BOTH VERSIONS OF LCMS */ +/* define to 1 if you have both liblcms and lcms.h installed */ +#undef OPJ_HAVE_LIBLCMS1 +/* #define OPJ_HAVE_LIBLCMS1 1 */ + +/* define to 1 if you have both liblcms2 and lcms2.h installed */ +#undef OPJ_HAVE_LIBLCMS2 +/* #define OPJ_HAVE_LIBLCMS2 1 */ + +/* define to 1 if you have both libpng and png.h installed */ +#undef OPJ_HAVE_LIBPNG +/* #define OPJ_HAVE_LIBPNG 1 */ + +/* define to 1 if you have both libtiff and tiff.h installed */ +#undef OPJ_HAVE_LIBTIFF +/* #define OPJ_HAVE_LIBTIFF 1 */ + +/*---------------- DO NOT CHANGE BELOW THIS LINE ----------------*/ +#define PACKAGE_URL "http://www.openjpeg.org/" +#define PACKAGE_BUGREPORT "http://code.google.com/p/openjpeg/" -- cgit v1.2.3