ref: 12c1455891de226bf93235fc4469f670d08c9b94
parent: 1da63d4cd36ab7dd6809b6eeb9ce1ef83d9be68b
author: Sebastian Rasmussen <[email protected]>
date: Wed Apr 10 14:00:35 EDT 2019
jbig2dec: Expose version number in header. Since the version number should only be specified in one location, the public jbig2dec header, autogen.sh will not regenrate the autoconf input file configure.ac.
--- a/autogen.sh
+++ b/autogen.sh
@@ -22,6 +22,11 @@
VERSIONMKMAJ="sed -e s/\([0-9][0-9]*\)[^0-9].*/\\1/"
VERSIONMKMIN="sed -e s/.*[0-9][0-9]*\.//"
+JBIG2VERSIONGREP="sed -e s/^.*(\([0-9]\+\)).*/\\1/"
+JBIG2MAJOR=$(grep 'define JBIG2_VERSION_MAJOR' jbig2.h | $JBIG2VERSIONGREP)
+JBIG2MINOR=$(grep 'define JBIG2_VERSION_MINOR' jbig2.h | $JBIG2VERSIONGREP)
+sed -e "s/^\(AC_INIT[^,]*,\)[^,]*\(,.*\)$/\1 [$JBIG2MAJOR.$JBIG2MINOR]\2/" configure.ac.in > configure.ac
+
# do we need automake?
if test "x$USE_OLD" = "xyes" ; then
if test -r Makefile.am; then
--- a/config_win32.h
+++ b/config_win32.h
@@ -19,10 +19,6 @@
/* configuration header file for compiling under Microsoft Windows */
-/* update package version here */
-#define PACKAGE "jbig2dec"
-#define VERSION "0.16"
-
#ifdef _MSC_VER
/* VS 2012 and later have stdint.h */
--- a/configure.ac
+++ /dev/null
@@ -1,150 +1,0 @@
-# Process this file with autoconf to produce a configure script.
-
-AC_INIT([jbig2dec], [0.16], [[email protected]])
-AC_PREREQ(2.53)
-AC_CONFIG_SRCDIR([jbig2dec.c])
-
-AM_INIT_AUTOMAKE([-Wall])
-AM_CONFIG_HEADER(config.h)
-
-dnl Library versioning - Adapted from the libtool info page
-dnl
-dnl 1. If source has changed at all: increment revision
-dnl 2. If the ABI changed: increment current, reset revision to 0
-dnl 3. If interfaces have been added since last public release: increment age
-dnl 4. If interfaces have been removed: reset age to 0
-
-AC_SUBST([JBIG2DEC_LT_CURRENT], [0])
-AC_SUBST([JBIG2DEC_LT_REVISION], [0])
-AC_SUBST([JBIG2DEC_LT_AGE], [0])
-
-# Checks for programs.
-AC_PROG_CC
-AM_PROG_CC_C_O
-AM_PROG_AR
-AC_LIBTOOL_WIN32_DLL
-AC_PROG_LIBTOOL
-
-# platform specific compiler flags
-if test "x$GCC" = xyes; then
- CFLAGS="$CFLAGS -Wall"
-fi
-
-# Checks for libraries.
-dnl by default we want png support if possible
-AC_ARG_WITH([libpng],
- AC_HELP_STRING([--with-libpng[=prefix]],
- [include support for png output (if libpng is available)]),
- [ac_cv_want_libpng="$withval"], [ac_cv_want_libpng="yes"])
-save_cflags="$CFLAGS"
-save_ldflags="$LDFLAGS"
-have_libpng="no"
-if test "x$ac_cv_want_libpng" != "xno"; then
- if test "x$ac_cv_want_libpng" != "xyes"; then
- dnl if it's not yes or no, treat as a prefix
- CFLAGS="$CFLAGS -I$ac_cv_want_libpng/include"
- LDFLAGS="$LDFLAGS -L$ac_cv_want_libpng/lib"
- fi
- dnl libpng requires pow() which may be in libm
- AC_SEARCH_LIBS([pow], [m])
- AC_CHECK_LIB([png], [png_create_write_struct], [
- AC_CHECK_LIB([z], [deflate], [
- AC_DEFINE(HAVE_LIBPNG, 1, [Define if libpng is available (-lpng)])
- PNG_LIBS="-lpng -lz"
- AC_LIBOBJ([jbig2_image_png])
- have_libpng="yes"
- ])
- ])
-fi
-dnl restore (possibly changed) flags if we didn't find working libpng
-if test "x$have_libpng" != "xyes"; then
- CFLAGS="$save_cflags"
- LDFLAGS="$save_ldflags"
-fi
-AC_SUBST(PNG_LIBS)
-
-# Checks for header files.
-AC_HEADER_STDC
-AC_CHECK_HEADERS([libintl.h stddef.h unistd.h strings.h])
-
-dnl We assume the fixed-size types from stdint.h. If that header is
-dnl not available, look for the same types in a few other headers.
-dnl We also attempt to define them ourselves, but only use those if
-dnl the native versions aren't available. The substitutions happen
-dnl in a file config_types.h, whose template is created by autogen.sh
-
-stdint_types_in="no_replacement_found"
-stdint_types_discovered="yes"
-AC_CHECK_SIZEOF(char)
-AC_CHECK_SIZEOF(short)
-AC_CHECK_SIZEOF(int)
-AC_CHECK_SIZEOF(long)
-case 1 in
- $ac_cv_sizeof_char) int8_type="char";;
- *) stdint_types_discovered="no"
-esac
-case 2 in
- $ac_cv_sizeof_short) int16_type="short";;
- $ac_cv_sizeof_char) int16_type="char";;
- $ac_cv_sizeof_int) int16_type="char";;
- *) stdint_types_discovered="no";;
-esac
-case 4 in
- $ac_cv_sizeof_int) int32_type="int";;
- $ac_cv_sizeof_long) int32_type="long";;
- $ac_cv_sizeof_short) int32_type="short";;
- *) stdint_types_discovered="no";;
-esac
-AC_CHECK_HEADER([stdint.h])
-if test "x$ac_cv_header_stdint_h" != "xyes"; then
- for include in sys/types.h inttypes.h sys/inttypes.h sys/int_types.h ; do
- AC_MSG_CHECKING([for uint32_t in $include])
- AC_TRY_COMPILE([#include <$include>], [uint32_t canary;], [
- AC_MSG_RESULT([yes])
- stdint_types_in="$include"
- break;
- ], AC_MSG_RESULT([no])
- )
- done
- if test "x$stdint_types_in" != "xno_replacement_found"; then
- AC_MSG_RESULT([Adding $stdint_types_in to config header for stdint types])
- AC_DEFINE([JBIG2_REPLACE_STDINT_H],,
- [set by configure if an alternate header with the stdint.h types is found])
- elif test "x$stdint_types_discovered" = "xno"; then
- AC_MSG_ERROR([
-Unable to find suitable definitions of the stdint.h types (uint32_t and friends)
-You will have to define these yourself in a separate header.
-See config_win32.h for an example.
- ])
- fi
-fi
-AC_SUBST(JBIG2_INT32_T, [$int32_type])
-AC_SUBST(JBIG2_INT16_T, [$int16_type])
-AC_SUBST(JBIG2_INT8_T, [$int8_type])
-AC_SUBST(JBIG2_STDINT_H, [$stdint_types_in])
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_SIZE_T
-AC_C_BIGENDIAN
-
-# Checks for library functions.
-AC_FUNC_MEMCMP
-dnl we use realloc() but don't depend on the zero-length behavior
-dnl tested by AC_FUNC_REALLOC
-AC_REPLACE_FUNCS([snprintf])
-
-AC_CHECK_FUNCS([memset strdup])
-
-dnl use our included getopt if the system doesn't have getopt_long()
-AC_CHECK_FUNC(getopt_long,
- AC_DEFINE(HAVE_GETOPT_LONG,,
- [Define if the local libc includes getopt_long()]
- ),[
- AC_LIBOBJ([getopt])
- AC_LIBOBJ([getopt1])
-])
-
-# generate output
-AC_CONFIG_FILES([Makefile config_types.h])
-AC_OUTPUT
--- /dev/null
+++ b/configure.ac.in
@@ -1,0 +1,150 @@
+# Process this file with autoconf to produce a configure script.
+
+AC_INIT([jbig2dec], [unknown-version], [[email protected]])
+AC_PREREQ(2.53)
+AC_CONFIG_SRCDIR([jbig2dec.c])
+
+AM_INIT_AUTOMAKE([-Wall])
+AM_CONFIG_HEADER(config.h)
+
+dnl Library versioning - Adapted from the libtool info page
+dnl
+dnl 1. If source has changed at all: increment revision
+dnl 2. If the ABI changed: increment current, reset revision to 0
+dnl 3. If interfaces have been added since last public release: increment age
+dnl 4. If interfaces have been removed: reset age to 0
+
+AC_SUBST([JBIG2DEC_LT_CURRENT], [0])
+AC_SUBST([JBIG2DEC_LT_REVISION], [0])
+AC_SUBST([JBIG2DEC_LT_AGE], [0])
+
+# Checks for programs.
+AC_PROG_CC
+AM_PROG_CC_C_O
+AM_PROG_AR
+AC_LIBTOOL_WIN32_DLL
+AC_PROG_LIBTOOL
+
+# platform specific compiler flags
+if test "x$GCC" = xyes; then
+ CFLAGS="$CFLAGS -Wall"
+fi
+
+# Checks for libraries.
+dnl by default we want png support if possible
+AC_ARG_WITH([libpng],
+ AC_HELP_STRING([--with-libpng[=prefix]],
+ [include support for png output (if libpng is available)]),
+ [ac_cv_want_libpng="$withval"], [ac_cv_want_libpng="yes"])
+save_cflags="$CFLAGS"
+save_ldflags="$LDFLAGS"
+have_libpng="no"
+if test "x$ac_cv_want_libpng" != "xno"; then
+ if test "x$ac_cv_want_libpng" != "xyes"; then
+ dnl if it's not yes or no, treat as a prefix
+ CFLAGS="$CFLAGS -I$ac_cv_want_libpng/include"
+ LDFLAGS="$LDFLAGS -L$ac_cv_want_libpng/lib"
+ fi
+ dnl libpng requires pow() which may be in libm
+ AC_SEARCH_LIBS([pow], [m])
+ AC_CHECK_LIB([png], [png_create_write_struct], [
+ AC_CHECK_LIB([z], [deflate], [
+ AC_DEFINE(HAVE_LIBPNG, 1, [Define if libpng is available (-lpng)])
+ PNG_LIBS="-lpng -lz"
+ AC_LIBOBJ([jbig2_image_png])
+ have_libpng="yes"
+ ])
+ ])
+fi
+dnl restore (possibly changed) flags if we didn't find working libpng
+if test "x$have_libpng" != "xyes"; then
+ CFLAGS="$save_cflags"
+ LDFLAGS="$save_ldflags"
+fi
+AC_SUBST(PNG_LIBS)
+
+# Checks for header files.
+AC_HEADER_STDC
+AC_CHECK_HEADERS([libintl.h stddef.h unistd.h strings.h])
+
+dnl We assume the fixed-size types from stdint.h. If that header is
+dnl not available, look for the same types in a few other headers.
+dnl We also attempt to define them ourselves, but only use those if
+dnl the native versions aren't available. The substitutions happen
+dnl in a file config_types.h, whose template is created by autogen.sh
+
+stdint_types_in="no_replacement_found"
+stdint_types_discovered="yes"
+AC_CHECK_SIZEOF(char)
+AC_CHECK_SIZEOF(short)
+AC_CHECK_SIZEOF(int)
+AC_CHECK_SIZEOF(long)
+case 1 in
+ $ac_cv_sizeof_char) int8_type="char";;
+ *) stdint_types_discovered="no"
+esac
+case 2 in
+ $ac_cv_sizeof_short) int16_type="short";;
+ $ac_cv_sizeof_char) int16_type="char";;
+ $ac_cv_sizeof_int) int16_type="char";;
+ *) stdint_types_discovered="no";;
+esac
+case 4 in
+ $ac_cv_sizeof_int) int32_type="int";;
+ $ac_cv_sizeof_long) int32_type="long";;
+ $ac_cv_sizeof_short) int32_type="short";;
+ *) stdint_types_discovered="no";;
+esac
+AC_CHECK_HEADER([stdint.h])
+if test "x$ac_cv_header_stdint_h" != "xyes"; then
+ for include in sys/types.h inttypes.h sys/inttypes.h sys/int_types.h ; do
+ AC_MSG_CHECKING([for uint32_t in $include])
+ AC_TRY_COMPILE([#include <$include>], [uint32_t canary;], [
+ AC_MSG_RESULT([yes])
+ stdint_types_in="$include"
+ break;
+ ], AC_MSG_RESULT([no])
+ )
+ done
+ if test "x$stdint_types_in" != "xno_replacement_found"; then
+ AC_MSG_RESULT([Adding $stdint_types_in to config header for stdint types])
+ AC_DEFINE([JBIG2_REPLACE_STDINT_H],,
+ [set by configure if an alternate header with the stdint.h types is found])
+ elif test "x$stdint_types_discovered" = "xno"; then
+ AC_MSG_ERROR([
+Unable to find suitable definitions of the stdint.h types (uint32_t and friends)
+You will have to define these yourself in a separate header.
+See config_win32.h for an example.
+ ])
+ fi
+fi
+AC_SUBST(JBIG2_INT32_T, [$int32_type])
+AC_SUBST(JBIG2_INT16_T, [$int16_type])
+AC_SUBST(JBIG2_INT8_T, [$int8_type])
+AC_SUBST(JBIG2_STDINT_H, [$stdint_types_in])
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+AC_TYPE_SIZE_T
+AC_C_BIGENDIAN
+
+# Checks for library functions.
+AC_FUNC_MEMCMP
+dnl we use realloc() but don't depend on the zero-length behavior
+dnl tested by AC_FUNC_REALLOC
+AC_REPLACE_FUNCS([snprintf])
+
+AC_CHECK_FUNCS([memset strdup])
+
+dnl use our included getopt if the system doesn't have getopt_long()
+AC_CHECK_FUNC(getopt_long,
+ AC_DEFINE(HAVE_GETOPT_LONG,,
+ [Define if the local libc includes getopt_long()]
+ ),[
+ AC_LIBOBJ([getopt])
+ AC_LIBOBJ([getopt1])
+])
+
+# generate output
+AC_CONFIG_FILES([Makefile config_types.h])
+AC_OUTPUT
--- a/jbig2.h
+++ b/jbig2.h
@@ -25,6 +25,9 @@
#ifndef _JBIG2_H
#define _JBIG2_H
+#define JBIG2_VERSION_MAJOR (0)
+#define JBIG2_VERSION_MINOR (16)
+
/* warning levels */
typedef enum {JBIG2_SEVERITY_DEBUG,
--- a/jbig2dec.c
+++ b/jbig2dec.c
@@ -21,13 +21,6 @@
#include "config.h"
#endif
-#ifndef PACKAGE
-#define PACKAGE "jbig2dec"
-#endif
-#ifndef VERSION
-#define VERSION "unknown-version"
-#endif
-
#include <stdio.h>
#include <stdlib.h>
#include <stddef.h>
@@ -209,7 +202,7 @@
static int
print_version(void)
{- fprintf(stdout, "%s %s\n", PACKAGE, VERSION);
+ fprintf(stdout, "jbig2dec %d.%d\n", JBIG2_VERSION_MAJOR, JBIG2_VERSION_MINOR);
return 0;
}