liblzf-3.6-autoconf-20140314.patch 7.8 KB

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