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