From a2f8752d2bd1379f7bbe422027c041925802f029 Mon Sep 17 00:00:00 2001 From: giraffedata Date: Thu, 18 Dec 2008 00:14:35 +0000 Subject: Release 10.44.04 git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@792 9d0c8265-081b-0410-96cb-a4ca84ce46f8 --- Makefile.version | 2 +- analyzer/pamtilt.c | 2 ++ buildtools/configure.pl | 4 +++- converter/other/jpeg2000/Makefile | 5 +++-- converter/other/jpeg2000/libjasper/Makefile.common | 2 +- converter/other/pgmtoppm.c | 1 + converter/other/svgtopam.c | 1 + doc/HISTORY | 13 ++++++++++++- editor/pnmmontage.c | 1 + editor/ppmcolormask.c | 1 + other/pamx/pamx.c | 1 + urt/Makefile | 4 ++-- 12 files changed, 29 insertions(+), 8 deletions(-) diff --git a/Makefile.version b/Makefile.version index 6ddc24d8..cfcf1e13 100644 --- a/Makefile.version +++ b/Makefile.version @@ -1,4 +1,4 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 44 -NETPBM_POINT_RELEASE = 3 +NETPBM_POINT_RELEASE = 4 diff --git a/analyzer/pamtilt.c b/analyzer/pamtilt.c index 37b6c394..2aa65df8 100644 --- a/analyzer/pamtilt.c +++ b/analyzer/pamtilt.c @@ -10,6 +10,8 @@ All work has been contributed to the public domain by its authors. =============================================================================*/ +#define _XOPEN_SOURCE /* get M_PI in math.h */ + #include #include diff --git a/buildtools/configure.pl b/buildtools/configure.pl index 9cb1313a..7f4d554f 100755 --- a/buildtools/configure.pl +++ b/buildtools/configure.pl @@ -1586,6 +1586,8 @@ This indicates Libxml2 is installed incorrectly on this system. If so, your Netpbm build, which uses 'xml2-config', will fail. But it might also just be our test that is broken. +'xml2-config' says to use compiler options '$xml2CFlags'. + EOF } @@ -1608,7 +1610,7 @@ sub testCompileXmlReaderTypes($$) { -sub printBadXml2XmlReaderTypesWarning($) { +sub printMissingXmlReaderTypesWarning() { print << 'EOF'; diff --git a/converter/other/jpeg2000/Makefile b/converter/other/jpeg2000/Makefile index 92225818..af8be82c 100644 --- a/converter/other/jpeg2000/Makefile +++ b/converter/other/jpeg2000/Makefile @@ -60,8 +60,9 @@ include $(SRCDIR)/Makefile.common LIBOPTS = $(shell $(LIBOPT) $(NETPBMLIB) $(JASPERLIB_USE)) $(BINARIES): %: %.o $(JASPERLIB_DEP) $(NETPBMLIB) $(LIBOPT) - $(LD) $(LDFLAGS) $(MATHLIB) $(LDLIBS) -o $@ $< \ - $(LIBOPTS) $(JASPERDEPLIBS) -lm $(RPATH) $(LADD) + $(LD) -o $@ $< \ + $(LIBOPTS) $(JASPERDEPLIBS) $(MATHLIB) $(RPATH) \ + $(LDFLAGS) $(LDLIBS) $(LADD) $(INTERNAL_JASPERLIB): $(BUILDDIR)/$(SUBDIR)/libjasper FORCE $(MAKE) -f $(SRCDIR)/$(SUBDIR)/libjasper/Makefile \ diff --git a/converter/other/jpeg2000/libjasper/Makefile.common b/converter/other/jpeg2000/libjasper/Makefile.common index d2cb7d42..af82401a 100644 --- a/converter/other/jpeg2000/libjasper/Makefile.common +++ b/converter/other/jpeg2000/libjasper/Makefile.common @@ -26,7 +26,7 @@ INCLUDES = -I$(JASPERSRCDIR)/include -Iimportinc DEFS = -DHAVE_LIBM=1 -DSTDC_HEADERS=1 -DHAVE_FCNTL_H=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STDDEF_H=1 -DEXCLUDE_BMP_SUPPORT -DEXCLUDE_RAS_SUPPORT -DEXCLUDE_MIF_SUPPORT -DEXCLUDE_JPG_SUPPORT -DEXCLUDE_PGX_SUPPORT -DEXCLUDE_PNM_SUPPORT $(LIB_OBJECTS):%.o:%.c - $(CC) -c $(CPPFLAGS) $(CFLAGS) $(INCLUDES) $(DEFS) $(CADD) $< + $(CC) -c $(INCLUDES) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(CADD) $< $(LIB_OBJECTS): importinc diff --git a/converter/other/pgmtoppm.c b/converter/other/pgmtoppm.c index cface024..12bc7d25 100644 --- a/converter/other/pgmtoppm.c +++ b/converter/other/pgmtoppm.c @@ -10,6 +10,7 @@ ** implied warranty. */ +#define _BSD_SOURCE /* Make sure strdup() is in */ #include #include "mallocvar.h" diff --git a/converter/other/svgtopam.c b/converter/other/svgtopam.c index 896c5f03..56825a4e 100644 --- a/converter/other/svgtopam.c +++ b/converter/other/svgtopam.c @@ -26,6 +26,7 @@ ============================================================================*/ +#define _BSD_SOURCE /* Make sure strdup() is in */ #include #include #include diff --git a/doc/HISTORY b/doc/HISTORY index 8bd9d31a..8f9c68c1 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,11 +4,22 @@ Netpbm. CHANGE HISTORY -------------- +08.12.17 BJH Release 10.44.04 + + Configure: fix crash when Libxml2 is installed, but not new + enough version. + + Build: Move CFLAGS later in libjasper and librle build so that a + -I in CFLAGS doesn't interfere with finding the local libjasper + and Netpbm header files. + + Build: Add source type declarations to make -ansi compile work. + 08.12.03 BJH Release 10.44.03 Build: Move LDFLAGS later so that a -L in LDFLAGS doesn't interfere with finding the built libnetpbm. (The common - link rule is already this way in 10.44.00; all the other + link rule is already this way in 10.44.02; all the other link rules are now the same). 08.10.27 BJH Release 10.44.02 diff --git a/editor/pnmmontage.c b/editor/pnmmontage.c index a7b74510..4ccff497 100644 --- a/editor/pnmmontage.c +++ b/editor/pnmmontage.c @@ -10,6 +10,7 @@ * implied warranty. */ +#define _BSD_SOURCE /* Make sure strdup() is in */ #include #include #include diff --git a/editor/ppmcolormask.c b/editor/ppmcolormask.c index eed64c19..0d7a214c 100644 --- a/editor/ppmcolormask.c +++ b/editor/ppmcolormask.c @@ -9,6 +9,7 @@ Contributed to the public domain by its author. =========================================================================*/ +#define _BSD_SOURCE /* Make sure strdup() is in */ #include #include diff --git a/other/pamx/pamx.c b/other/pamx/pamx.c index 49aa07c9..de390098 100644 --- a/other/pamx/pamx.c +++ b/other/pamx/pamx.c @@ -3,6 +3,7 @@ Copyright information is in the file COPYRIGHT */ +#define _BSD_SOURCE /* Make sure strdup() is in */ #include #include #include diff --git a/urt/Makefile b/urt/Makefile index 930cae6c..45972094 100644 --- a/urt/Makefile +++ b/urt/Makefile @@ -24,8 +24,8 @@ librle.a: $(LIBOBJECTS) # Rule for objects. $(LIBOBJECTS): %.o: %.c importinc - $(CC) -c $(CPPFLAGS) $(CFLAGS) -I importinc -o $@ \ - $< $(CFLAGS_PERSONAL) $(CADD) + $(CC) -c -I importinc -o $@ \ + $< $(CPPFLAGS) $(CFLAGS) $(CFLAGS_PERSONAL) $(CADD) BINARIES = SCRIPTS = -- cgit 1.4.1