update jasper to 1.600.0

pkgsrc changes:
	fix include files -- they used autoconf HAVE_XXX defines

Changes:
	- The support for the JP2 format has been improved.
	- The support for the PNM family of formats has been improved (and
	  should now be truly complete).
	- Numerous other minor bugs have been fixed.

[The new program jiv (jasper image viewer) is disabled, since it
needs X11 and OpenGL.  It will be commited as a separate package.]

7 files changed, 592 insertions, 13 deletions

diff --git a/graphics/jasper/Makefile b/graphics/jasper/Makefile
index e0b5fc4faf0..36af16ff313 100644
--- a/graphics/jasper/Makefile
+++ b/graphics/jasper/Makefile
@@ -1,19 +1,20 @@
-# $NetBSD: Makefile,v 1.3 2002/10/09 18:42:55 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2002/11/12 19:39:15 dillo Exp $
 #
 
-DISTNAME=		jasper-1.500.4
+DISTNAME=		jasper-1.600.0
 CATEGORIES=		graphics
-MASTER_SITES=		http://www.ece.ubc.ca/~mdadams/jasper/software/
+MASTER_SITES=		http://www.ece.uvic.ca/~mdadams/jasper/software/
 EXTRACT_SUFX=		.zip
 
 MAINTAINER=		packages@netbsd.org
-HOMEPAGE=		http://www.ece.ubc.ca/~mdadams/jasper/
+HOMEPAGE=		http://www.ece.uvic.ca/~mdadams/jasper/
 COMMENT=		software-based reference implementation of the JPEG-2000 codec
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
+CONFIGURE_ARGS+=	--enable-shared --without-x --disable-opengl
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/jasper
diff --git a/graphics/jasper/PLIST b/graphics/jasper/PLIST
index 35b0d4127b3..3362df28cca 100644
--- a/graphics/jasper/PLIST
+++ b/graphics/jasper/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/04/08 12:25:54 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/11/12 19:39:15 dillo Exp $
 bin/imgcmp
 bin/imginfo
 bin/jasper
@@ -16,9 +16,9 @@ include/jasper/jas_tvp.h
 include/jasper/jas_types.h
 include/jasper/jas_version.h
 include/jasper/jasper.h
-lib/libjasper-1.500.so
-lib/libjasper-1.500.so.4
-lib/libjasper-1.500.so.4.0
+lib/libjasper-1.600.so
+lib/libjasper-1.600.so.0
+lib/libjasper-1.600.so.0.0
 lib/libjasper.a
 lib/libjasper.la
 lib/libjasper.so
diff --git a/graphics/jasper/buildlink2.mk b/graphics/jasper/buildlink2.mk
index 1a77bf9bc6a..955541502cf 100644
--- a/graphics/jasper/buildlink2.mk
+++ b/graphics/jasper/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/11/11 21:28:27 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2002/11/12 19:39:15 dillo Exp $
 
 .if !defined(JASPER_BUILDLINK2_MK)
 JASPER_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		jasper
-BUILDLINK_DEPENDS.jasper?=	jasper>=1.500.0
+BUILDLINK_DEPENDS.jasper?=	jasper>=1.600.0
 BUILDLINK_PKGSRCDIR.jasper?=	../../graphics/jasper
 
 EVAL_PREFIX+=		BUILDLINK_PREFIX.jasper=jasper
diff --git a/graphics/jasper/distinfo b/graphics/jasper/distinfo
index e8118ffaa48..88d0c6d65c3 100644
--- a/graphics/jasper/distinfo
+++ b/graphics/jasper/distinfo
@@ -1,4 +1,7 @@
-$NetBSD: distinfo,v 1.2 2002/04/08 12:25:55 wiz Exp $
+$NetBSD: distinfo,v 1.3 2002/11/12 19:39:15 dillo Exp $
 
-SHA1 (jasper-1.500.4.zip) = 603fa2b8da5934862771b1e3f1703ce4aa4acff4
-Size (jasper-1.500.4.zip) = 1109886 bytes
+SHA1 (jasper-1.600.0.zip) = a4a3b44dbf82b1f0b1bc0454262ae22188b293a9
+Size (jasper-1.600.0.zip) = 1294537 bytes
+SHA1 (patch-aa) = aa46766e7bfa028707b11f6711b5086cbfa125ac
+SHA1 (patch-ab) = 58f6df6b4c3097921cc10798546d4a68ef470d0a
+SHA1 (patch-ac) = 757b754de10c1d4304d492ee4f875d7881f12129
diff --git a/graphics/jasper/patches/patch-aa b/graphics/jasper/patches/patch-aa
new file mode 100644
index 00000000000..8aaf25942ca
--- /dev/null
+++ b/graphics/jasper/patches/patch-aa
@@ -0,0 +1,127 @@
+$NetBSD: patch-aa,v 1.1 2002/11/12 19:39:16 dillo Exp $
+
+--- configure.in.orig	Sat Oct 19 05:32:16 2002
++++ configure.in
+@@ -253,6 +253,114 @@ esac
+ ], [debug=false])
+ 
+ ################################################################################
++# Generate substitutions for jas_types.h
++################################################################################
++
++if test "$ac_cv_type_longlong" = "yes"
++then
++	HAVE_LONGLONG=1
++else
++	HAVE_LONGLONG=0
++fi
++AC_SUBST(HAVE_LONGLONG)
++
++if test "$ac_cv_type_ssize_t" = "yes"
++then
++	HAVE_SSIZE_T=1
++else
++	HAVE_SSIZE_T=0
++fi
++AC_SUBST(HAVE_SSIZE_T)
++
++if test "$ac_cv_type_uchar" = "yes"
++then
++	HAVE_UCHAR=1
++else
++	HAVE_UCHAR=0
++fi
++AC_SUBST(HAVE_UCHAR)
++
++if test "$ac_cv_type_uint" = "yes"
++then
++	HAVE_UINT=1
++else
++	HAVE_UINT=0
++fi
++AC_SUBST(HAVE_UINT)
++
++if test "$ac_cv_type_ulong" = "yes"
++then
++	HAVE_ULONG=1
++else
++	HAVE_ULONG=0
++fi
++AC_SUBST(HAVE_ULONG)
++
++if test "$ac_cv_type_ulonglong" = "yes"
++then
++	HAVE_ULONGLONG=1
++else
++	HAVE_ULONGLONG=0
++fi
++AC_SUBST(HAVE_ULONGLONG)
++
++if test "$ac_cv_type_ushort" = "yes"
++then
++	HAVE_USHORT=1
++else
++	HAVE_USHORT=0
++fi
++AC_SUBST(HAVE_USHORT)
++
++if test "$ac_cv_header_stdbool_h" = "yes"
++then
++	HAVE_STDBOOL_H=1
++else
++	HAVE_STDBOOL_H=0
++fi
++AC_SUBST(HAVE_STDBOOL_H)
++
++if test "$ac_cv_header_stddef_h" = "yes"
++then
++	HAVE_STDDEF_H=1
++else
++	HAVE_STDDEF_H=0
++fi
++AC_SUBST(HAVE_STDDEF_H)
++
++if test "$ac_cv_header_stdint_h" = "yes"
++then
++	HAVE_STDINT_H=1
++else
++	HAVE_STDINT_H=0
++fi
++AC_SUBST(HAVE_STDINT_H)
++
++if test "$ac_cv_header_stdlib_h" = "yes"
++then
++	HAVE_STDLIB_H=1
++else
++	HAVE_STDLIB_H=0
++fi
++AC_SUBST(HAVE_STDLIB_H)
++
++if test "$ac_cv_header_sys_types_h" = "yes"
++then
++	HAVE_SYS_TYPES_H=1
++else
++	HAVE_SYS_TYPES_H=0
++fi
++AC_SUBST(HAVE_SYS_TYPES_H)
++
++if test "$ac_cv_header_windows_h" = "yes"
++then
++	HAVE_WINDOWS_H=1
++else
++	HAVE_WINDOWS_H=0
++fi
++AC_SUBST(HAVE_WINDOWS_H, 1)
++
++################################################################################
+ # Generate the makefiles.
+ ################################################################################
+ 
+@@ -265,6 +373,7 @@ src/libjasper/base/Makefile
+ src/libjasper/bmp/Makefile
+ src/libjasper/include/Makefile
+ src/libjasper/include/jasper/Makefile
++src/libjasper/include/jasper/jas_types.h
+ src/libjasper/jp2/Makefile
+ src/libjasper/jpc/Makefile
+ src/libjasper/jpg/Makefile
diff --git a/graphics/jasper/patches/patch-ab b/graphics/jasper/patches/patch-ab
new file mode 100644
index 00000000000..a1762f82e68
--- /dev/null
+++ b/graphics/jasper/patches/patch-ab
@@ -0,0 +1,155 @@
+$NetBSD: patch-ab,v 1.1 2002/11/12 19:39:16 dillo Exp $
+
+--- configure.orig	Sat Oct 19 08:48:25 2002
++++ configure
+@@ -7694,6 +7694,114 @@ fi
+ 
+ 
+ ################################################################################
++# Generate substitutions for jas_types.h
++################################################################################
++
++if test "$ac_cv_type_longlong" = "yes"
++then
++	HAVE_LONGLONG=1
++else
++	HAVE_LONGLONG=0
++fi
++
++
++if test "$ac_cv_type_ssize_t" = "yes"
++then
++	HAVE_SSIZE_T=1
++else
++	HAVE_SSIZE_T=0
++fi
++
++
++if test "$ac_cv_type_uchar" = "yes"
++then
++	HAVE_UCHAR=1
++else
++	HAVE_UCHAR=0
++fi
++
++
++if test "$ac_cv_type_uint" = "yes"
++then
++	HAVE_UINT=1
++else
++	HAVE_UINT=0
++fi
++
++
++if test "$ac_cv_type_ulong" = "yes"
++then
++	HAVE_ULONG=1
++else
++	HAVE_ULONG=0
++fi
++
++
++if test "$ac_cv_type_ulonglong" = "yes"
++then
++	HAVE_ULONGLONG=1
++else
++	HAVE_ULONGLONG=0
++fi
++
++
++if test "$ac_cv_type_ushort" = "yes"
++then
++	HAVE_USHORT=1
++else
++	HAVE_USHORT=0
++fi
++
++
++if test "$ac_cv_header_stdbool_h" = "yes"
++then
++	HAVE_STDBOOL_H=1
++else
++	HAVE_STDBOOL_H=0
++fi
++
++
++if test "$ac_cv_header_stddef_h" = "yes"
++then
++	HAVE_STDDEF_H=1
++else
++	HAVE_STDDEF_H=0
++fi
++
++
++if test "$ac_cv_header_stdint_h" = "yes"
++then
++	HAVE_STDINT_H=1
++else
++	HAVE_STDINT_H=0
++fi
++
++
++if test "$ac_cv_header_stdlib_h" = "yes"
++then
++	HAVE_STDLIB_H=1
++else
++	HAVE_STDLIB_H=0
++fi
++
++
++if test "$ac_cv_header_sys_types_h" = "yes"
++then
++	HAVE_SYS_TYPES_H=1
++else
++	HAVE_SYS_TYPES_H=0
++fi
++
++
++if test "$ac_cv_header_windows_h" = "yes"
++then
++	HAVE_WINDOWS_H=1
++else
++	HAVE_WINDOWS_H=0
++fi
++
++
++################################################################################
+ # Generate the makefiles.
+ ################################################################################
+ 
+@@ -7819,6 +7927,7 @@ src/libjasper/base/Makefile
+ src/libjasper/bmp/Makefile
+ src/libjasper/include/Makefile
+ src/libjasper/include/jasper/Makefile
++src/libjasper/include/jasper/jas_types.h
+ src/libjasper/jp2/Makefile
+ src/libjasper/jpc/Makefile
+ src/libjasper/jpg/Makefile
+@@ -7914,6 +8023,19 @@ s%@HAVE_LIBJPEG_FALSE@%$HAVE_LIBJPEG_FAL
+ s%@HAVE_OPENGL_TRUE@%$HAVE_OPENGL_TRUE%g
+ s%@HAVE_OPENGL_FALSE@%$HAVE_OPENGL_FALSE%g
+ s%@OPENGL_LIBS@%$OPENGL_LIBS%g
++s%@HAVE_LONGLONG@%$HAVE_LONGLONG%g
++s%@HAVE_SSIZE_T@%$HAVE_SSIZE_T%g
++s%@HAVE_UCHAR@%$HAVE_UCHAR%g
++s%@HAVE_UINT@%$HAVE_UINT%g
++s%@HAVE_ULONG@%$HAVE_ULONG%g
++s%@HAVE_ULONGLONG@%$HAVE_ULONGLONG%g
++s%@HAVE_USHORT@%$HAVE_USHORT%g
++s%@HAVE_STDBOOL_H@%$HAVE_STDBOOL_H%g
++s%@HAVE_STDDEF_H@%$HAVE_STDDEF_H%g
++s%@HAVE_STDINT_H@%$HAVE_STDINT_H%g
++s%@HAVE_STDLIB_H@%$HAVE_STDLIB_H%g
++s%@HAVE_SYS_TYPES_H@%$HAVE_SYS_TYPES_H%g
++s%@HAVE_WINDOWS_H@%$HAVE_WINDOWS_H%g
+ 
+ CEOF
+ EOF
+@@ -7963,6 +8085,7 @@ src/libjasper/base/Makefile
+ src/libjasper/bmp/Makefile
+ src/libjasper/include/Makefile
+ src/libjasper/include/jasper/Makefile
++src/libjasper/include/jasper/jas_types.h
+ src/libjasper/jp2/Makefile
+ src/libjasper/jpc/Makefile
+ src/libjasper/jpg/Makefile
diff --git a/graphics/jasper/patches/patch-ac b/graphics/jasper/patches/patch-ac
new file mode 100644
index 00000000000..74edc68170f
--- /dev/null
+++ b/graphics/jasper/patches/patch-ac
@@ -0,0 +1,293 @@
+$NetBSD: patch-ac,v 1.1 2002/11/12 19:39:16 dillo Exp $
+
+--- src/libjasper/include/jasper/jas_types.h.in.orig	Tue Nov 12 19:04:17 2002
++++ src/libjasper/include/jasper/jas_types.h.in
+@@ -0,0 +1,288 @@
++/*
++ * Copyright (c) 1999-2000 Image Power, Inc. and the University of
++ *   British Columbia.
++ * Copyright (c) 2001-2002 Michael David Adams.
++ * All rights reserved.
++ */
++
++/* __START_OF_JASPER_LICENSE__
++ * 
++ * JasPer Software License
++ * 
++ * IMAGE POWER JPEG-2000 PUBLIC LICENSE
++ * ************************************
++ * 
++ * GRANT:
++ * 
++ * Permission is hereby granted, free of charge, to any person (the "User")
++ * obtaining a copy of this software and associated documentation, to deal
++ * in the JasPer Software without restriction, including without limitation
++ * the right to use, copy, modify, merge, publish, distribute, sublicense,
++ * and/or sell copies of the JasPer Software (in source and binary forms),
++ * and to permit persons to whom the JasPer Software is furnished to do so,
++ * provided further that the License Conditions below are met.
++ * 
++ * License Conditions
++ * ******************
++ * 
++ * A.  Redistributions of source code must retain the above copyright notice,
++ * and this list of conditions, and the following disclaimer.
++ * 
++ * B.  Redistributions in binary form must reproduce the above copyright
++ * notice, and this list of conditions, and the following disclaimer in
++ * the documentation and/or other materials provided with the distribution.
++ * 
++ * C.  Neither the name of Image Power, Inc. nor any other contributor
++ * (including, but not limited to, the University of British Columbia and
++ * Michael David Adams) may be used to endorse or promote products derived
++ * from this software without specific prior written permission.
++ * 
++ * D.  User agrees that it shall not commence any action against Image Power,
++ * Inc., the University of British Columbia, Michael David Adams, or any
++ * other contributors (collectively "Licensors") for infringement of any
++ * intellectual property rights ("IPR") held by the User in respect of any
++ * technology that User owns or has a right to license or sublicense and
++ * which is an element required in order to claim compliance with ISO/IEC
++ * 15444-1 (i.e., JPEG-2000 Part 1).  "IPR" means all intellectual property
++ * rights worldwide arising under statutory or common law, and whether
++ * or not perfected, including, without limitation, all (i) patents and
++ * patent applications owned or licensable by User; (ii) rights associated
++ * with works of authorship including copyrights, copyright applications,
++ * copyright registrations, mask work rights, mask work applications,
++ * mask work registrations; (iii) rights relating to the protection of
++ * trade secrets and confidential information; (iv) any right analogous
++ * to those set forth in subsections (i), (ii), or (iii) and any other
++ * proprietary rights relating to intangible property (other than trademark,
++ * trade dress, or service mark rights); and (v) divisions, continuations,
++ * renewals, reissues and extensions of the foregoing (as and to the extent
++ * applicable) now existing, hereafter filed, issued or acquired.
++ * 
++ * E.  If User commences an infringement action against any Licensor(s) then
++ * such Licensor(s) shall have the right to terminate User's license and
++ * all sublicenses that have been granted hereunder by User to other parties.
++ * 
++ * F.  This software is for use only in hardware or software products that
++ * are compliant with ISO/IEC 15444-1 (i.e., JPEG-2000 Part 1).  No license
++ * or right to this Software is granted for products that do not comply
++ * with ISO/IEC 15444-1.  The JPEG-2000 Part 1 standard can be purchased
++ * from the ISO.
++ * 
++ * THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE.
++ * NO USE OF THE JASPER SOFTWARE IS AUTHORIZED HEREUNDER EXCEPT UNDER
++ * THIS DISCLAIMER.  THE JASPER SOFTWARE IS PROVIDED BY THE LICENSORS AND
++ * CONTRIBUTORS UNDER THIS LICENSE ON AN ``AS-IS'' BASIS, WITHOUT WARRANTY
++ * OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION,
++ * WARRANTIES THAT THE JASPER SOFTWARE IS FREE OF DEFECTS, IS MERCHANTABLE,
++ * IS FIT FOR A PARTICULAR PURPOSE OR IS NON-INFRINGING.  THOSE INTENDING
++ * TO USE THE JASPER SOFTWARE OR MODIFICATIONS THEREOF FOR USE IN HARDWARE
++ * OR SOFTWARE PRODUCTS ARE ADVISED THAT THEIR USE MAY INFRINGE EXISTING
++ * PATENTS, COPYRIGHTS, TRADEMARKS, OR OTHER INTELLECTUAL PROPERTY RIGHTS.
++ * THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE JASPER SOFTWARE
++ * IS WITH THE USER.  SHOULD ANY PART OF THE JASPER SOFTWARE PROVE DEFECTIVE
++ * IN ANY RESPECT, THE USER (AND NOT THE INITIAL DEVELOPERS, THE UNIVERSITY
++ * OF BRITISH COLUMBIA, IMAGE POWER, INC., MICHAEL DAVID ADAMS, OR ANY
++ * OTHER CONTRIBUTOR) SHALL ASSUME THE COST OF ANY NECESSARY SERVICING,
++ * REPAIR OR CORRECTION.  UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY,
++ * WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE
++ * INITIAL DEVELOPER, THE UNIVERSITY OF BRITISH COLUMBIA, IMAGE POWER, INC.,
++ * MICHAEL DAVID ADAMS, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE
++ * JASPER SOFTWARE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO
++ * THE USER OR ANY OTHER PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR
++ * CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION,
++ * DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR
++ * MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF
++ * SUCH PARTY HAD BEEN INFORMED, OR OUGHT TO HAVE KNOWN, OF THE POSSIBILITY
++ * OF SUCH DAMAGES.  THE JASPER SOFTWARE AND UNDERLYING TECHNOLOGY ARE NOT
++ * FAULT-TOLERANT AND ARE NOT DESIGNED, MANUFACTURED OR INTENDED FOR USE OR
++ * RESALE AS ON-LINE CONTROL EQUIPMENT IN HAZARDOUS ENVIRONMENTS REQUIRING
++ * FAIL-SAFE PERFORMANCE, SUCH AS IN THE OPERATION OF NUCLEAR FACILITIES,
++ * AIRCRAFT NAVIGATION OR COMMUNICATION SYSTEMS, AIR TRAFFIC CONTROL, DIRECT
++ * LIFE SUPPORT MACHINES, OR WEAPONS SYSTEMS, IN WHICH THE FAILURE OF THE
++ * JASPER SOFTWARE OR UNDERLYING TECHNOLOGY OR PRODUCT COULD LEAD DIRECTLY
++ * TO DEATH, PERSONAL INJURY, OR SEVERE PHYSICAL OR ENVIRONMENTAL DAMAGE
++ * ("HIGH RISK ACTIVITIES").  LICENSOR SPECIFICALLY DISCLAIMS ANY EXPRESS
++ * OR IMPLIED WARRANTY OF FITNESS FOR HIGH RISK ACTIVITIES.  USER WILL NOT
++ * KNOWINGLY USE, DISTRIBUTE OR RESELL THE JASPER SOFTWARE OR UNDERLYING
++ * TECHNOLOGY OR PRODUCTS FOR HIGH RISK ACTIVITIES AND WILL ENSURE THAT ITS
++ * CUSTOMERS AND END-USERS OF ITS PRODUCTS ARE PROVIDED WITH A COPY OF THE
++ * NOTICE SPECIFIED IN THIS SECTION.
++ * 
++ * __END_OF_JASPER_LICENSE__
++ */
++
++/*
++ * Primitive Types
++ */
++
++#ifndef JAS_TYPES_H
++#define JAS_TYPES_H
++
++#if !defined(JAS_CONFIGURE)
++
++/*
++   We are not using a configure-based build.  Try to compensate for
++   this here, by defining the types normally defined by configure.
++   Note: These types should match those specified in the configure.in file.
++ */
++#if !@HAVE_UCHAR@
++#define	uchar		unsigned char
++#endif
++#if !@HAVE_USHORT@
++#define	ushort		unsigned short
++#endif
++#if !@HAVE_UINT@
++#define	uint		unsigned int
++#endif
++#if !@HAVE_ULONG@
++#define	ulong		unsigned long
++#endif
++#if !@HAVE_LONGLONG@
++#define	longlong	long long
++#endif
++#if !@HAVE_ULONGLONG@
++#define	ulonglong	unsigned long long
++#endif
++#if !@HAVE_SSIZE_T@
++#define	ssize_t		int
++#endif
++
++#if defined(WIN32) || @HAVE_WINDOWS_H@
++/*
++   We are dealing with Microsoft Windows and most likely Microsoft
++   Visual C (MSVC).  (Heaven help us.)  Sadly, MSVC does not correctly
++   define some of the standard types specified in ISO/IEC 9899:1999.
++   In particular, it does not define the "long long" and "unsigned long
++   long" types.  So, we work around this problem by using the "INT64"
++   and "UINT64" types that are defined in the header file "windows.h".
++ */
++#include <windows.h>
++#undef longlong
++#define	longlong	INT64
++#undef ulonglong
++#define	ulonglong	UINT64
++#endif
++
++#endif
++
++#if @HAVE_STDLIB_H@
++#include <stdlib.h>
++#endif
++#if @HAVE_STDDEF_H@
++#include <stddef.h>
++#endif
++#if @HAVE_SYS_TYPES_H@
++#include <sys/types.h>
++#endif
++
++#if @HAVE_STDBOOL_H@
++/*
++ * The C language implementation does correctly provide the standard header
++ * file "stdbool.h".
++ */
++#include <stdbool.h>
++#else
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++/*
++ * The C language implementation does not provide the standard header file
++ * "stdbool.h" as required by ISO/IEC 9899:1999.  Try to compensate for this
++ * braindamage below.
++ */
++#if !defined(bool)
++#define	bool	int
++#endif
++#if !defined(true)
++#define true	1
++#endif
++#if !defined(false)
++#define	false	0
++#endif
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif
++
++#if @HAVE_STDINT_H@
++/*
++ * The C language implementation does correctly provide the standard header
++ * file "stdint.h".
++ */
++#include <stdint.h>
++#else
++/*
++ * The C language implementation does not provide the standard header file
++ * "stdint.h" as required by ISO/IEC 9899:1999.  Try to compensate for this
++ * braindamage below.
++ */
++#include <limits.h>
++/**********/
++#if !defined(INT_FAST8_MIN)
++typedef signed char int_fast8_t;
++#define INT_FAST8_MIN	(-127)
++#define INT_FAST8_MAX	128
++#endif
++/**********/
++#if !defined(UINT_FAST8_MIN)
++typedef unsigned char uint_fast8_t;
++#define UINT_FAST8_MIN	0
++#define UINT_FAST8_MAX	255
++#endif
++/**********/
++#if !defined(INT_FAST16_MIN)
++typedef short int_fast16_t;
++#define INT_FAST16_MIN	SHRT_MIN
++#define INT_FAST16_MAX	SHRT_MAX
++#endif
++/**********/
++#if !defined(UINT_FAST16_MIN)
++typedef unsigned short uint_fast16_t;
++#define UINT_FAST16_MIN	USHRT_MIN
++#define UINT_FAST16_MAX	USHRT_MAX
++#endif
++/**********/
++#if !defined(INT_FAST32_MIN)
++typedef int int_fast32_t;
++#define INT_FAST32_MIN	INT_MIN
++#define INT_FAST32_MAX	INT_MAX
++#endif
++/**********/
++#if !defined(UINT_FAST32_MIN)
++typedef unsigned int uint_fast32_t;
++#define UINT_FAST32_MIN	UINT_MIN
++#define UINT_FAST32_MAX	UINT_MAX
++#endif
++/**********/
++#if !defined(INT_FAST64_MIN)
++typedef longlong int_fast64_t;
++#define INT_FAST64_MIN	LLONG_MIN
++#define INT_FAST64_MAX	LLONG_MAX
++#endif
++/**********/
++#if !defined(UINT_FAST64_MIN)
++typedef ulonglong uint_fast64_t;
++#define UINT_FAST64_MIN	ULLONG_MIN
++#define UINT_FAST64_MAX	ULLONG_MAX
++#endif
++/**********/
++#endif
++
++/* The below macro is intended to be used for type casts.  By using this
++  macro, type casts can be easily located in the source code with
++  tools like "grep". */
++#define	JAS_CAST(t, e) \
++	((t) (e))
++
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++#ifdef __cplusplus
++}
++#endif
++
++#endif