Attachment 866774 Details for Bug 1066559 – Update sources for autotools to work with newer versions + helper ./bootstrap script.

[patch] Update sources for autotools to work with newer versions + helper ./bootstrap script.

id3lib-autotools.diff (text/plain), 4.15 KB, created by František Dvořák on 2014-02-23 21:16:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: František Dvořák

Created: 2014-02-23 21:16:01 UTC

Size: 4.15 KB

patch

obsolete

>commit 7636b5af46c9c532a291bc3eeb331e8869ce4218
>Author: FrantiÅ¡ek DvoÅÃ¡k <valtri@civ.zcu.cz>
>Date:   Sun Feb 23 19:31:20 2014 +0100
>
>    Update autotools usage:
>    - m4 warnings
>    - flags for m4 macro dir
>    - modernize autostuff calls
>    - fix header templates
>    - some warning
>    - bootstrap script
>
>diff --git a/Makefile.am b/Makefile.am
>index 3181288..a239ca9 100644
>--- a/Makefile.am
>+++ b/Makefile.am
>@@ -11,6 +11,7 @@
> 
> # require automake 1.5
> AUTOMAKE_OPTIONS = 1.5
>+ACLOCAL_AMFLAGS = -I m4
> 
> EXTRA_DIST =                    \
>         HISTORY                 \
>@@ -30,7 +31,7 @@ endif
> SUBDIRS =  . m4 $(zlib_subdir) doc include id3com src examples
> DIST_SUBDIRS = . m4 zlib doc include id3com src examples prj libprj
> 
>-INCLUDES = @ID3LIB_DEBUG_FLAGS@
>+AM_CPPFLAGS = @ID3LIB_DEBUG_FLAGS@
> 
> config.h.win32: $(top_builddir)/config.status $(top_srcdir)/config.h.win32.in 
> 	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
>diff --git a/bootstrap b/bootstrap
>new file mode 100755
>index 0000000..062bcb3
>--- /dev/null
>+++ b/bootstrap
>@@ -0,0 +1,6 @@
>+#! /bin/sh -xe
>+libtoolize -fi
>+aclocal
>+autoconf
>+autoheader
>+automake -af
>diff --git a/configure.in b/configure.in
>index 9110c5c..b195308 100644
>--- a/configure.in
>+++ b/configure.in
>@@ -15,8 +15,10 @@
> AC_PREREQ(2.13)
> 
> # init autoconf (and check for presence fo reconf)
>-AC_INIT(reconf)
>-
>+AC_INIT([id3lib], [3.8.3])
>+AC_CONFIG_SRCDIR([reconf])
>+AC_CONFIG_MACRO_DIR([m4])
>+,
> ID3LIB_NAME=id3lib
> 
> dnl The following has been adapted from glib (http://www.gtk.org)
>@@ -85,7 +87,7 @@ AC_SUBST(ID3LIB_FULLNAME)
> 
> AC_CONFIG_HEADERS(config.h)
> 
>-AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
>+AM_INIT_AUTOMAKE
> 
> AC_ISC_POSIX
> 
>@@ -168,7 +170,7 @@ if test $has_iconv = 1; then
> 		iconv_oldstyle=1, iconv_oldstyle=0)
>   if test $iconv_oldstyle = 1; then
>     AC_MSG_RESULT(const char **)
>-    AC_DEFINE(ID3LIB_ICONV_OLDSTYLE)
>+    AC_DEFINE([ID3LIB_ICONV_OLDSTYLE], [], [Old-style iconv interface])
>     #we'll check out the need of
>     #typecast in the call of iconv_open
>     AC_MSG_CHECKING(whether to typecast in iconv)
>@@ -184,7 +186,7 @@ if test $has_iconv = 1; then
>                    iconv_cast=0, iconv_cast=1)
>     if test $iconv_cast = 1; then
>       AC_MSG_RESULT(yes)
>-      AC_DEFINE(ID3LIB_ICONV_CAST_OK)
>+      AC_DEFINE([ID3LIB_ICONV_CAST_OK], [], [iconv type cast])
>     else
>       AC_MSG_RESULT(no)
>     fi
>@@ -206,7 +208,7 @@ if test $has_iconv = 1; then
>                    iconv_cast=0, iconv_cast=1)
>     if test $iconv_cast = 1; then
>       AC_MSG_RESULT(yes)
>-      AC_DEFINE(ID3LIB_ICONV_CAST_OK)
>+      AC_DEFINE(ID3LIB_ICONV_CAST_OK, [], [iconv type cast])
>     else
>       AC_MSG_RESULT(no)
>     fi
>diff --git a/examples/Makefile.am b/examples/Makefile.am
>index 8b087fb..6691a8f 100644
>--- a/examples/Makefile.am
>+++ b/examples/Makefile.am
>@@ -30,7 +30,7 @@ endif
> 
> LDADD =  $(top_builddir)/src/libid3.la $(zlib_lib) $(ID3_DEBUG_LIBS) $(getopt_lib)
> 
>-INCLUDES = @ID3LIB_DEBUG_FLAGS@ -I$(top_srcdir)/include
>+AM_CPPFLAGS = @ID3LIB_DEBUG_FLAGS@ -I$(top_srcdir)/include
> 
> bin_PROGRAMS            = id3info id3convert id3tag id3cp
> check_PROGRAMS          = \
>diff --git a/m4/id3_cxx.m4 b/m4/id3_cxx.m4
>index 06248ae..251242f 100644
>--- a/m4/id3_cxx.m4
>+++ b/m4/id3_cxx.m4
>@@ -68,7 +68,7 @@ dnl #undef CXX_HAS_BUGGY_FOR_LOOPS
> dnl #undef CXX_HAS_NO_BOOL
> dnl END ACCONFIG
> 
>-AC_DEFUN(ID3_CXX_PORTABILITY,[
>+AC_DEFUN([ID3_CXX_PORTABILITY],[
> 
>   AC_PROVIDE([$0])
> 
>diff --git a/m4/id3_unicode.m4 b/m4/id3_unicode.m4
>index b2cb2a1..5325c8c 100644
>--- a/m4/id3_unicode.m4
>+++ b/m4/id3_unicode.m4
>@@ -5,7 +5,7 @@ dnl #undef ID3_ICONV_FORMAT_UTF8
> dnl #undef ID3_ICONV_FORMAT_ASCII
> dnl END ACCONFIG
> 
>-AC_DEFUN(ID3_CHECK_ICONV_FORMAT,[
>+AC_DEFUN([ID3_CHECK_ICONV_FORMAT],[
>   if eval "test \"x\$$1\" = \"xno\""; then
>     AC_MSG_CHECKING(whether iconv supports $2)
>     AC_TRY_RUN([#include <iconv.h>
>diff --git a/src/Makefile.am b/src/Makefile.am
>index 8b0f682..ddfa553 100644
>--- a/src/Makefile.am
>+++ b/src/Makefile.am
>@@ -17,7 +17,7 @@ else
> zlib_include = 
> endif
> 
>-INCLUDES = \
>+AM_CPPFLAGS = \
>   @ID3LIB_DEBUG_FLAGS@ -I$(top_srcdir)/include/id3 -I$(top_srcdir)/include $(zlib_include)
> 
> noinst_HEADERS =                \

Actions: View | Diff

Attachments on bug 1066559: 866774 | 866775