1 diff -uNr liblzf-3.6.ORIG/bootstrap.sh liblzf-3.6/bootstrap.sh
2 --- liblzf-3.6.ORIG/bootstrap.sh 1970-01-01 00:00:00.000000000 +0000
3 +++ liblzf-3.6/bootstrap.sh 2014-03-13 08:10:49.132000000 +0000
4 @@ -0,0 +1,10 @@
5 +#!/bin/sh
6 +set -x
7 +mkdir -p config
8 +aclocal -I config
9 +#aclocal-1.10 -I config
10 +autoheader
11 +libtoolize --automake
12 +automake --add-missing --copy --foreign
13 +#automake-1.10 --add-missing --copy
14 +autoconf
15 diff -uNr liblzf-3.6.ORIG/config.h.in liblzf-3.6/config.h.in
16 --- liblzf-3.6.ORIG/config.h.in 2014-03-13 08:10:30.234000000 +0000
17 +++ liblzf-3.6/config.h.in 2014-03-13 08:10:49.133000000 +0000
18 @@ -1,16 +1,89 @@
19 -/* config.h.in. Generated automatically from configure.in by autoheader 2.13. */
20 +/* config.h.in. Generated from configure.ac by autoheader. */
21
22 -/* Define to empty if the keyword does not work. */
23 -#undef const
24 +/* Define to 1 if you have the <dlfcn.h> header file. */
25 +#undef HAVE_DLFCN_H
26 +
27 +/* Define to 1 if you have the <errno.h> header file. */
28 +#undef HAVE_ERRNO_H
29 +
30 +/* Define to 1 if you have the <fcntl.h> header file. */
31 +#undef HAVE_FCNTL_H
32 +
33 +/* Define to 1 if you have the <getopt.h> header file. */
34 +#undef HAVE_GETOPT_H
35 +
36 +/* Define to 1 if you have the `getopt_long' function. */
37 +#undef HAVE_GETOPT_LONG
38 +
39 +/* Define to 1 if you have the <inttypes.h> header file. */
40 +#undef HAVE_INTTYPES_H
41 +
42 +/* Define to 1 if you have the <limits.h> header file. */
43 +#undef HAVE_LIMITS_H
44 +
45 +/* Define to 1 if you have the <memory.h> header file. */
46 +#undef HAVE_MEMORY_H
47 +
48 +/* Define to 1 if you have the <stdint.h> header file. */
49 +#undef HAVE_STDINT_H
50 +
51 +/* Define to 1 if you have the <stdio.h> header file. */
52 +#undef HAVE_STDIO_H
53 +
54 +/* Define to 1 if you have the <stdlib.h> header file. */
55 +#undef HAVE_STDLIB_H
56 +
57 +/* Define to 1 if you have the <strings.h> header file. */
58 +#undef HAVE_STRINGS_H
59 +
60 +/* Define to 1 if you have the <string.h> header file. */
61 +#undef HAVE_STRING_H
62
63 -/* Define if you have the ANSI C header files. */
64 +/* Define to 1 if you have the <sys/stat.h> header file. */
65 +#undef HAVE_SYS_STAT_H
66 +
67 +/* Define to 1 if you have the <sys/types.h> header file. */
68 +#undef HAVE_SYS_TYPES_H
69 +
70 +/* Define to 1 if you have the <unistd.h> header file. */
71 +#undef HAVE_UNISTD_H
72 +
73 +/* Define to the sub-directory in which libtool stores uninstalled libraries.
74 + */
75 +#undef LT_OBJDIR
76 +
77 +/* Define to the address where bug reports for this package should be sent. */
78 +#undef PACKAGE_BUGREPORT
79 +
80 +/* Define to the full name of this package. */
81 +#undef PACKAGE_NAME
82 +
83 +/* Define to the full name and version of this package. */
84 +#undef PACKAGE_STRING
85 +
86 +/* Define to the one symbol short name of this package. */
87 +#undef PACKAGE_TARNAME
88 +
89 +/* Define to the home page for this package. */
90 +#undef PACKAGE_URL
91 +
92 +/* Define to the version of this package. */
93 +#undef PACKAGE_VERSION
94 +
95 +/* Define to 1 if you have the ANSI C header files. */
96 #undef STDC_HEADERS
97
98 -/* The number of bytes in a int. */
99 -#undef SIZEOF_INT
100 +/* Number of bits in a file offset, on hosts where this is settable. */
101 +#undef _FILE_OFFSET_BITS
102 +
103 +/* Define for large files, on AIX-style hosts. */
104 +#undef _LARGE_FILES
105
106 -/* The number of bytes in a long. */
107 -#undef SIZEOF_LONG
108 +/* Define to empty if `const' does not conform to ANSI C. */
109 +#undef const
110
111 -/* The number of bytes in a short. */
112 -#undef SIZEOF_SHORT
113 +/* Define to `__inline__' or `__inline' if that's what the C compiler
114 + calls it, or to nothing if 'inline' is not supported under any name. */
115 +#ifndef __cplusplus
116 +#undef inline
117 +#endif
118 diff -uNr liblzf-3.6.ORIG/configure.ac liblzf-3.6/configure.ac
119 --- liblzf-3.6.ORIG/configure.ac 2014-03-13 08:10:30.233000000 +0000
120 +++ liblzf-3.6/configure.ac 2014-03-13 08:10:49.133000000 +0000
121 @@ -1,9 +1,65 @@
122 -AC_INIT
123 -AC_CONFIG_SRCDIR([lzfP.h])
124 +AC_INIT(lzf.c)
125 +
126 +AC_CONFIG_AUX_DIR(config)
127 +
128 +AC_CANONICAL_SYSTEM
129 +AM_CONFIG_HEADER(config.h)
130 +AC_CHECK_HEADERS(getopt.h)
131 +
132 +
133 +
134 +dnl uncomment when tagging
135 +#RELEASE=TRUE
136 +
137 +VER_ARCHITECTURE=3
138 +VER_MAJOR=6
139 +VER_MINOR=0
140 +VER_PATCH=0
141 +if test "A" = A$RELEASE; then
142 + VER_PATCH=${VER_PATCH}_`date '+20%y%m%d%H'`
143 +fi
144 +
145 +AM_INIT_AUTOMAKE(liblzf,$VER_ARCHITECTURE.$VER_MAJOR.$VER_MINOR,"http://software.schmorp.de/pkg/liblzf")
146 +AC_SUBST(VER_ARCHITECTURE)
147 +AC_SUBST(VER_MAJOR)
148 +AC_SUBST(VER_MINOR)
149 +AC_SUBST(VER_PATCH)
150 +
151 +LIBRARY_VERSION="1:0:0"
152 +
153 +AC_SUBST(LIBRARY_VERSION)
154 +
155 +
156 +#
157 +# Wall
158 +#
159 +AC_CACHE_CHECK([for maximum warnings compiler flag],
160 + ac_cv_cwflag,
161 +[case "${CC-cc}" in
162 + *gcc*) ac_cv_cwflag="-Wall -pedantic -pipe -O3 -funroll-all-loops";;
163 + *)
164 + ;;
165 +esac])
166 +AC_SUBST([CWFLAG], [$ac_cv_cwflag])
167 +
168 +AM_PROG_LIBTOOL
169 +AC_PROG_LN_S
170 +AC_CHECK_HEADERS([limits.h])
171 +AC_CHECK_HEADERS([errno.h])
172 +AC_CHECK_HEADERS([fcntl.h])
173 +AC_CHECK_HEADERS([stdio.h])
174 +LT_INIT
175 +
176 +AC_CONFIG_SRCDIR([lzf_c.c])
177 +
178 +
179 +if test "${prefix}" = NONE ; then
180 + liblzf_prefix=/usr/local
181 +else
182 + liblzf_prefix=${prefix}
183 +fi
184
185 -AC_CONFIG_HEADER(config.h)
186
187 -AC_GNU_SOURCE
188 AC_SYS_LARGEFILE
189 AC_PROG_CC
190 AC_PROG_RANLIB
191 @@ -14,12 +70,6 @@
192 AC_C_INLINE
193 AC_CHECK_HEADERS(getopt.h)
194 AC_CHECK_FUNCS(getopt_long)
195 +AC_SUBST(ac_aux_dir)
196
197 -if test "$GCC" = yes; then
198 - CFLAGS="$CFLAGS -O3 -funroll-all-loops"
199 -else
200 - AC_MSG_RESULT(no gcc)
201 -fi
202 -
203 -AC_CONFIG_FILES([Makefile])
204 -AC_OUTPUT
205 +AC_OUTPUT(Makefile liblzf.pc)
206 diff -uNr liblzf-3.6.ORIG/liblzf.pc.in liblzf-3.6/liblzf.pc.in
207 --- liblzf-3.6.ORIG/liblzf.pc.in 1970-01-01 00:00:00.000000000 +0000
208 +++ liblzf-3.6/liblzf.pc.in 2014-03-13 08:10:49.134000000 +0000
209 @@ -0,0 +1,11 @@
210 +prefix=@prefix@
211 +exec_prefix=@exec_prefix@
212 +libdir=@libdir@
213 +includedir=@includedir@
214 +
215 +Name: liblzf
216 +Description: Small data compression library
217 +URL: http://oldhome.schmorp.de/marc/liblzf.html
218 +Version: @VERSION@
219 +Libs: -L${libdir} -llzf
220 +Cflags: -I${includedir}
221 diff -uNr liblzf-3.6.ORIG/Makefile.am liblzf-3.6/Makefile.am
222 --- liblzf-3.6.ORIG/Makefile.am 1970-01-01 00:00:00.000000000 +0000
223 +++ liblzf-3.6/Makefile.am 2014-03-13 08:12:06.195000000 +0000
224 @@ -0,0 +1,74 @@
225 +$(PROGRAMS): $(LDEPS)
226 +
227 +
228 +
229 +h_sources = lzf.h lzfP.h
230 +c_sources = lzf_c.c \
231 + lzf_d.c \
232 + crc32.h \
233 + lzfP.h
234 +
235 +
236 +library_includedir="$(includedir)"
237 +
238 +
239 +INCLUDES = -I$(includedir) -DLOCALEDIR=\"$(localedir)\"
240 +
241 +library_include_HEADERS = $(h_sources)
242 +
243 +lib_LTLIBRARIES = liblzf.la
244 +
245 +liblzf_la_SOURCES = $(c_sources)
246 +liblzf_la_LDFLAGS = -no-undefined -version-info $(LIBRARY_VERSION)
247 +
248 +bin_PROGRAMS = lzf
249 +lzf_SOURCES = lzf.c
250 +lzf_LDADD = $(LDADDS) liblzf.la
251 +topdir=@RPM_DIR@
252 +
253 +
254 +AUX_DIST = $(ac_aux_dir)/config.guess \
255 + $(ac_aux_dir)/config.sub \
256 + $(ac_aux_dir)/install-sh \
257 + $(ac_aux_dir)/ltmain.sh \
258 + $(ac_aux_dir)/missing \
259 + $(ac_aux_dir)/ltconfig \
260 + $(ac_aux_dir)/ltmain.sh
261 +
262 +MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config-h.in \
263 + stamp-h.in $(AUX_DIST)
264 +
265 +ACLOCAL = aclocal -I $(ac_aux_dir)
266 +
267 +
268 +dist-hook:
269 + (cd $(distdir); \
270 + if [ -a $(ac_aux_dir) ]; then \
271 + echo "config exist!"; \
272 + else \
273 + mkdir $(ac_aux_dir); \
274 + fi)
275 + (if [ -a $(ac_aux_dir)/depcomp ]; then \
276 + echo "depcomp exist!"; \
277 + else \
278 + touch $(ac_aux_dir)/depcomp; \
279 + fi)
280 + for file in $(AUX_DIST) $(AUX_DIST_EXTRA); do \
281 + cp $$file $(distdir)/$$file; \
282 + done
283 +
284 +docfiles = \
285 + LICENSE \
286 + Changes \
287 + README
288 +
289 +
290 +csCLZFfiles = \
291 + cs/CLZF.cs \
292 + cs/README
293 +
294 +EXTRA_DIST = $(docfiles) $(csCLZFfiles) bootstrap.sh
295 +
296 +pkgconfigdir = $(libdir)/pkgconfig
297 +pkgconfig_DATA = liblzf.pc
298 +
299 diff -uNr liblzf-3.6.ORIG/Makefile.in liblzf-3.6/Makefile.in
300 --- liblzf-3.6.ORIG/Makefile.in 2014-03-13 08:10:30.233000000 +0000
301 +++ liblzf-3.6/Makefile.in 2014-03-13 08:13:08.090000000 +0000
302 @@ -41,6 +41,7 @@
303 $(INSTALL) -m 755 lzf $(bindir)
304 $(INSTALL) -d $(includedir)
305 $(INSTALL_DATA) lzf.h $(includedir)
306 + $(INSTALL_DATA) lzfP.h $(includedir)
307 $(INSTALL) -d $(libdir)
308 $(INSTALL_DATA) liblzf.a $(libdir)
309
|
