do not forget about linking fetch.o - needed on bigendian platforms

 (.)

diff --git a/ChangeLog b/ChangeLog
index c8845ac4267d5f32bd9fda9f69ca23b00d4a3eb8..38aa7a74b1f6ab5ce4b5c016e5db774af70830a7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-02-19
+ * a test run on solaris did show that fetch.* needs to be linked
+       to the new lib*.la stuff - to convert endianess-dependent
+       values from zip to main memory
+ * there seems to be an automake problem with hpux10 that I can not
+       yet define on what grounds it is - to get away with it I am
+       not defining automake 1.7 as the version to be used, plus
+       autoconf 2.57 - these are pretty new.
+
 2004-01-24
  * zzip/fseeko.c and bins/zzip.c had some issued with non-C99 compilers
        which do not like variable declarations in the middle of a block

diff --git a/Makefile.am b/Makefile.am
index 8abbde3239a14645ccb0d41c1c6ebe24cd72aeb1..4c8409906e0844f648c726324721ca3c4e003175 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = 1.4 foreign dist-bzip2
-WANT_AUTOMAKE = 1.6
-WANT_AUTOCONF = 2.52
+WANT_AUTOMAKE = 1.7
+WANT_AUTOCONF = 2.57
 
 DIST_SUBDIRS = zzip zzipwrap bins test docs  SDL
 SUBDIRS =      zzip zzipwrap bins test docs @SDL@

diff --git a/Makefile.in b/Makefile.in
index 93258d620d5fa50c222872018fd1eecf034a20eb..be93a8ab6914568528cbd3127cd0f9916902a7cb 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -150,8 +150,8 @@ target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
 AUTOMAKE_OPTIONS = 1.4 foreign dist-bzip2
-WANT_AUTOMAKE = 1.6
-WANT_AUTOCONF = 2.52
+WANT_AUTOMAKE = 1.7
+WANT_AUTOCONF = 2.57
 
 DIST_SUBDIRS = zzip zzipwrap bins test docs  SDL
 SUBDIRS = zzip zzipwrap bins test docs @SDL@

diff --git a/configure b/configure
index c8641490ce0c42f9c3bb3821d1179ef2f25bc14e..6c69b3b6a22e29bc147c781f05f82942073a1518 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 1.2 .
+# From configure.ac Revision: 1.3 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.57.
 #
@@ -10142,7 +10142,8 @@ fi
 done
 
 
-for ac_func in strcasecmp
+
+for ac_func in strcasecmp strndup
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_func" >&5

diff --git a/zzip/Makefile.am b/zzip/Makefile.am
index c10535f5fcf6498d9114d8ee1771b2c9e4861137..a0044e080f7b2406c29eebff3d70996dc268d983 100644 (file)
--- a/zzip/Makefile.am
+++ b/zzip/Makefile.am
@@ -1,4 +1,4 @@
-AUTOMAKE_OPTIONS = 1.4 foreign
+AUTOMAKE_OPTIONS = 1.5 foreign
 AUTOTOOL_VERSION=autoconf-2.52 automake-1.5 libtool-1.4.2
 DEFAULT_INCLUDES = # nothing - no default of -I. -I$(srcdir)
 DEFS = @DEFS@ -I$(top_builddir) -I$(top_srcdir) # also for automake 1.4
@@ -43,14 +43,14 @@ libzzip_la_LDFLAGS= @ZZIPLIB_LDFLAGS@ $(RELEASE_INFO) $(VERSION_INFO) \
                     $(THREAD_SAFE)
 libzzip_la_LIBADD= -lz @RESOLVES@
 
-libzzipmmapped_la_SOURCES =  mmapped.c
-libzzipmmapped_la_headers =  mmapped.h
+libzzipmmapped_la_SOURCES =  mmapped.c fetch.c
+libzzipmmapped_la_headers =  mmapped.h fetch.h
 libzzipmmapped_la_LDFLAGS= @ZZIPLIB_LDFLAGS@ $(RELEASE_INFO) $(VERSION_INFO) \
                     $(THREAD_SAFE)
 libzzipmmapped_la_LIBADD= -lz @RESOLVES@
 
-libzzipfseeko_la_SOURCES = fseeko.c
-libzzipfseeko_la_headers = fseeko.h
+libzzipfseeko_la_SOURCES = fseeko.c fetch.c
+libzzipfseeko_la_headers = fseeko.h fetch.h
 libzzipfseeko_la_LDFLAGS= @ZZIPLIB_LDFLAGS@ $(RELEASE_INFO) $(VERSION_INFO) \
                     $(THREAD_SAFE)
 libzzipfseeko_la_LIBADD= -lz @RESOLVES@

diff --git a/zzip/Makefile.in b/zzip/Makefile.in
index e6dcbba3fd796b38c70794cdbdd6152c66072e61..21478755cfb28f5b6308546d43237a3372d7fe16 100644 (file)
--- a/zzip/Makefile.in
+++ b/zzip/Makefile.in
@@ -152,7 +152,7 @@ target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-AUTOMAKE_OPTIONS = 1.4 foreign
+AUTOMAKE_OPTIONS = 1.5 foreign
 AUTOTOOL_VERSION = autoconf-2.52 automake-1.5 libtool-1.4.2
 DEFAULT_INCLUDES = # nothing - no default of -I. -I$(srcdir)
 
@@ -196,15 +196,15 @@ libzzip_la_LDFLAGS = @ZZIPLIB_LDFLAGS@ $(RELEASE_INFO) $(VERSION_INFO) \
 
 libzzip_la_LIBADD = -lz @RESOLVES@
 
-libzzipmmapped_la_SOURCES = mmapped.c
-libzzipmmapped_la_headers = mmapped.h
+libzzipmmapped_la_SOURCES = mmapped.c fetch.c
+libzzipmmapped_la_headers = mmapped.h fetch.h
 libzzipmmapped_la_LDFLAGS = @ZZIPLIB_LDFLAGS@ $(RELEASE_INFO) $(VERSION_INFO) \
                     $(THREAD_SAFE)
 
 libzzipmmapped_la_LIBADD = -lz @RESOLVES@
 
-libzzipfseeko_la_SOURCES = fseeko.c
-libzzipfseeko_la_headers = fseeko.h
+libzzipfseeko_la_SOURCES = fseeko.c fetch.c
+libzzipfseeko_la_headers = fseeko.h fetch.h
 libzzipfseeko_la_LDFLAGS = @ZZIPLIB_LDFLAGS@ $(RELEASE_INFO) $(VERSION_INFO) \
                     $(THREAD_SAFE)
 
@@ -231,10 +231,10 @@ am_libzzip_la_OBJECTS = zip.lo file.lo dir.lo stat.lo info.lo err.lo \
        plugin.lo write.lo fetch.lo
 libzzip_la_OBJECTS = $(am_libzzip_la_OBJECTS)
 libzzipfseeko_la_DEPENDENCIES =
-am_libzzipfseeko_la_OBJECTS = fseeko.lo
+am_libzzipfseeko_la_OBJECTS = fseeko.lo fetch.lo
 libzzipfseeko_la_OBJECTS = $(am_libzzipfseeko_la_OBJECTS)
 libzzipmmapped_la_DEPENDENCIES =
-am_libzzipmmapped_la_OBJECTS = mmapped.lo
+am_libzzipmmapped_la_OBJECTS = mmapped.lo fetch.lo
 libzzipmmapped_la_OBJECTS = $(am_libzzipmmapped_la_OBJECTS)
 depcomp = $(SHELL) $(top_srcdir)/uses/depcomp
 am__depfiles_maybe = depfiles

diff --git a/zzip/plugin.h b/zzip/plugin.h
index 48f88165a083eba9ef47d8798af9eea662e0cc69..b6ccbe8a66f82d8eb8b2e7a686284cdabb3861b1 100644 (file)
--- a/zzip/plugin.h
+++ b/zzip/plugin.h
@@ -50,7 +50,7 @@ struct zzip_plugin_io { /* use "zzip_plugin_io_handlers" in applications !! */
     long         sys;
     long         type;
     zzip_ssize_t (*write)(int fd, _zzip_const void* buf, zzip_size_t len);
-} fd;
+};
 
 typedef union _zzip_plugin_io
 {

diff --git a/zziplib.spec b/zziplib.spec
index d07fe9179dfac661ec14960a70431257b66ba60d..b5fd70fb55c0b87030f2d5627b98d0cbd2ce4150 100644 (file)
--- a/zziplib.spec
+++ b/zziplib.spec
@@ -1,7 +1,7 @@
 %define lib   lib010
 Summary:      ZZipLib - libZ-based ZIP-access Library
 Name:         zziplib
-Version:      0.13.33
+Version:      0.13.34
 Release:      1mdk
 Serial:       1
 Copyright:    LGPL