Commit cd2e5129 authored by Axel Beckert's avatar Axel Beckert

Move to quilt patch management

parent d08bc9fd
AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I m4
DIST_SUBDIRS = pcre lib src po doc modules tests
DIST_SUBDIRS = intl pcre lib src po doc modules tests
if LOADABLE_MODULES
SUBDIRS = pcre lib src po doc modules tests
SUBDIRS = intl pcre lib src po doc modules tests
else
SUBDIRS = pcre lib src po doc tests
SUBDIRS = intl pcre lib src po doc tests
endif
EXTRA_DIST = CREDITS README README.pcre bootstrap.sh shtool
......
......@@ -2,7 +2,7 @@
mp4h -- Macro Processor for HTML Documents
Version 1.3.1 (11-Jan-2003)
http://mp4h.tuxfamily.org/
http://www.engelschall.com/sw/mp4h/
Copyright (C) 2000-2003, Denis Barbier
All rights reserved.
......
......@@ -8,7 +8,7 @@
# serial 1
AC_DEFUN([MP4H_LOADABLE_MODULES],
AC_DEFUN(MP4H_LOADABLE_MODULES,
[AC_MSG_CHECKING(if support for loadable modules is requested)
AC_ARG_WITH(modules,
[ --with-modules=x,y,z select loadable modules to compile],
......
dnl As this file is called configure.ac, Autoconf 2.50 is required
AC_PREREQ([2.50])
AC_CONFIG_MACRO_DIR([m4])
AC_INIT([mp4h], [1.3.1])
PACKAGE_DATE="11-Jan-2003"
......@@ -18,8 +17,30 @@ $shtool echo -e "Configuring for %B$PACKAGE_NAME $PACKAGE_VERSION ($PACKAGE_DATE
AM_INIT_AUTOMAKE([$PACKAGE_NAME], [$PACKAGE_VERSION])
AM_MAINTAINER_MODE
if test x$datadir = 'x${prefix}/share'; then
if test x$prefix = xNONE; then
MP4HDATADIR="$ac_default_prefix/share/mp4h"
else
MP4HDATADIR="$prefix/share/mp4h"
fi
else
MP4HDATADIR="$datadir/mp4h"
fi
if test x$libdir = 'x${exec_prefix}/lib'; then
if test x$prefix = xNONE; then
MP4HLIBDIR="$ac_default_prefix/lib/mp4h"
else
MP4HLIBDIR="$prefix/lib/mp4h"
fi
else
MP4HLIBDIR="$libdir/mp4h"
fi
AC_DEFINE_UNQUOTED([MP4HLIBDIR], ["$MP4HLIBDIR/$PACKAGE_VERSION:$MP4HDATADIR"],
[Default location for mp4h modules])
AC_PROG_CC
AC_PROG_CPP
AC_PROG_RANLIB
AC_PROG_MAKE_SET
AC_PROG_INSTALL
......@@ -59,8 +80,13 @@ AC_MSG_RESULT([no])
AC_SUBST([TIDY])
ALL_LINGUAS=
AM_GNU_GETTEXT([external])
AM_GNU_GETTEXT
if test ".$USE_INCLUDED_LIBINTL" = .yes; then
INTLINCL='-I$(top_srcdir)/intl'
AC_SUBST([INTLINCL])
fi
MP4H_LOADABLE_MODULES
......@@ -79,8 +105,13 @@ test ".$with_modules" = .yes && with_modules=`echo $module_list | sed -e 's/ */
if test ".$with_modules" != .no; then
echo ''
$shtool echo -e "Checking for %Bloadable modules%b support"
LT_INIT([dlopen win32-dll shared disable-static])
LTDL_INIT([])
AC_LIBTOOL_WIN32_DLL
AC_LIBLTDL_CONVENIENCE
AC_ENABLE_SHARED
AC_DISABLE_STATIC
AC_LIBTOOL_DLOPEN
AC_LIBTOOL_SETUP
AC_PROG_LIBTOOL
case ,$with_modules, in
*,intl:gettext,* )
......@@ -126,6 +157,10 @@ fi
test ".$with_modules" = . && with_modules=none
AC_LIB_LTDL
AC_SUBST(INCLTDL)
AC_SUBST(LIBLTDL)
AC_MSG_CHECKING([which modules to compile])
AC_MSG_RESULT([$with_modules])
......@@ -140,10 +175,10 @@ AM_CONDITIONAL([DO_MODULE_WML], [test ".$_do_module_wml" = .1])
dnl This line is needed for Debian builds
AC_SUBST(CFLAGS)
AC_SUBST([INTLINCL], [])
AC_CONFIG_FILES([
Makefile
intl/Makefile
pcre/Makefile
lib/Makefile
src/Makefile
......
......@@ -14,7 +14,15 @@ mp4h (1.3.1-5) unreleased; urgency=low
- spelling-error-in-manpage mp4h.1 informations information
* Calculate module path via make, not configure. (Closes: #573599)
-- Thorsten Glaser <tg@mirbsd.de> Sun, 21 Mar 2010 19:00:57 +0000
[ Axel Beckert ]
* Move over to quilt patch management
- Move all source code patches contained in the diff.gz into quilt
patches
- Split up in logical patches
- Update build dependencies
- Add patch targets and dependencies to debian/rules
-- Axel Beckert <abe@debian.org> Mon, 22 Mar 2010 00:09:17 +0100
mp4h (1.3.1-4.1) unstable; urgency=high
......
......@@ -3,7 +3,7 @@ Section: web
Priority: optional
Maintainer: Felipe Augusto van de Wiel (faw) <faw@debian.org>
Standards-Version: 3.7.2
Build-Depends: debhelper (>= 5~), tidy,
Build-Depends: debhelper (>= 5~), tidy, quilt,
autoconf (>= 2.57~), automake1.9, autotools-dev, gettext,
libtool, libltdl-dev
Build-Conflicts: autoconf2.13, automake1.4
......
--- mp4h-1.3.1.orig/src/output.c
+++ mp4h-1.3.1/src/output.c
@@ -513,7 +513,7 @@
text += length - 1;
}
else
- for (; *(text+1) != '\0'; text++)
+ for (; *text != '\0'; text++)
{
if (start_of_output_line)
{
--- mp4h-1.3.1.orig/src/readme.tmpl
+++ mp4h-1.3.1/src/readme.tmpl
@@ -2,7 +2,7 @@
mp4h -- Macro Processor for HTML Documents
Version @PACKAGE_VERSION@ (@PACKAGE_DATE@)
- http://www.engelschall.com/sw/mp4h/
+ http://mp4h.tuxfamily.org/
Copyright (C) 2000-2003, Denis Barbier
All rights reserved.
--- mp4h-1.3.1.orig/src/ltdl.c.patch
+++ mp4h-1.3.1/src/ltdl.c.patch
@@ -0,0 +1,40 @@
+--- ltdl.c Tue Jun 11 18:23:20 2002
++++ ltdl.c Sun Jun 30 23:23:36 2002
+@@ -2039,7 +2039,7 @@
+ }
+
+ /* try to open the not-installed module */
+- if (!installed)
++ if (!installed && objdir)
+ {
+ if (tryall_dlopen_module (handle, dir, objdir, dlname) == 0)
+ return 0;
+@@ -2047,7 +2047,7 @@
+
+ /* maybe it was moved to another directory */
+ {
+- if (tryall_dlopen_module (handle,
++ if (dir && tryall_dlopen_module (handle,
+ (const char *) 0, dir, dlname) == 0)
+ return 0;
+ }
+@@ -2691,10 +2691,6 @@
+ }
+ #endif
+ }
+- if (!file)
+- {
+- file = fopen (filename, LT_READTEXT_MODE);
+- }
+
+ /* If we didn't find the file by now, it really isn't there. Set
+ the status flag, and bail out. */
+@@ -2990,7 +2986,7 @@
+ failed, it is better to return an error message here than to
+ report FILE_NOT_FOUND when the alternatives (foo.so etc) are not
+ in the module search path. */
+- if (handle || ((errors > 0) && file_not_found ()))
++ if (handle || ((errors > 0) && !file_not_found ()))
+ {
+ LT_DLFREE (tmp);
+ return handle;
--- mp4h-1.3.1.orig/modules/system/exec.src
+++ mp4h-1.3.1/modules/system/exec.src
@@ -4,7 +4,7 @@
;;; Copyright (c) 2001-2003, Denis Barbier, All Rights Reserved.
;;;
-<load module="system:exec">
+<load module="system:exec" />
##EOF##
__END__
--- mp4h-1.3.1.orig/modules/system/sh.src
+++ mp4h-1.3.1/modules/system/sh.src
@@ -4,7 +4,7 @@
;;; Copyright (c) 2001-2003, Denis Barbier, All Rights Reserved.
;;;
-<load module="system:sh">
+<load module="system:sh" />
##EOF##
__END__
--- mp4h-1.3.1.orig/modules/intl/gettext.src
+++ mp4h-1.3.1/modules/intl/gettext.src
@@ -4,7 +4,7 @@
;;; Copyright (c) 2002-2003, Denis Barbier, All Rights Reserved.
;;;
-<load module="intl:gettext">
+<load module="intl:gettext" />
##EOF##
__END__
--- mp4h-1.3.1.orig/README
+++ mp4h-1.3.1/README
@@ -2,7 +2,7 @@
mp4h -- Macro Processor for HTML Documents
Version 1.3.1 (11-Jan-2003)
- http://www.engelschall.com/sw/mp4h/
+ http://mp4h.tuxfamily.org/
Copyright (C) 2000-2003, Denis Barbier
All rights reserved.
--- mp4h-1.3.1.orig/doc/mp4h.mp4h
+++ mp4h-1.3.1/doc/mp4h.mp4h
@@ -38,7 +38,7 @@
written by Brian J. Fox, Even if both syntaxes look similar, source
code is completely different. Indeed, a subset of &Meta-HTML; was used
as a part of a more complex program, &WML;
-(<URL src="http://www.engelschall.com/sw/wml/" name="Website Meta Language" />)
+(<URL src="http://www.thewml.org/" name="Website Meta Language" />)
written by Ralf S. Engelschall and which I maintain since January 1999.
For licensing reasons, it was hard to hack &Meta-HTML; and so I decided
to write my own macro-processor.
@@ -48,7 +48,7 @@
Instead of rewriting it from scratch, I preferred using another
macro-processor engine. I chose
<URL src="http://www.gnu.org/software/m4/" name="GNU &m4;" />,
-written by Ren Seindal, because of its numerous advantages :
+written by Rene Seindal, because of its numerous advantages :
this software is stable, robust and very well documented.
This version of &mp4h; is derived from GNU &m4; version 1.4n, which is a
development version.
@@ -2786,7 +2786,7 @@
<para>
Mp4h has its own
-<URL src="http://www.engelschall.com/sw/mp4h/" name="homepage" />.
+<URL src="http://mp4h.tuxfamily.org/" name="homepage" />.
</para>
<section>Thanks</section>
diff --git a/Makefile.am b/Makefile.am
index ef51e6f..5034f74 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,6 @@
AUTOMAKE_OPTIONS = foreign
+ACLOCAL_AMFLAGS = -I m4
DIST_SUBDIRS = intl pcre lib src po doc modules tests
diff --git a/acinclude.m4 b/acinclude.m4
index f010988..13d1caa 100755
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -8,7 +8,7 @@
# serial 1
-AC_DEFUN(MP4H_LOADABLE_MODULES,
+AC_DEFUN([MP4H_LOADABLE_MODULES],
[AC_MSG_CHECKING(if support for loadable modules is requested)
AC_ARG_WITH(modules,
[ --with-modules=x,y,z select loadable modules to compile],
diff --git a/configure.ac b/configure.ac
index 4a10699..92badef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,6 @@
dnl As this file is called configure.ac, Autoconf 2.50 is required
AC_PREREQ([2.50])
+AC_CONFIG_MACRO_DIR([m4])
AC_INIT([mp4h], [1.3.1])
PACKAGE_DATE="11-Jan-2003"
@@ -40,7 +41,6 @@ AC_DEFINE_UNQUOTED([MP4HLIBDIR], ["$MP4HLIBDIR/$PACKAGE_VERSION:$MP4HDATADIR"],
AC_PROG_CC
AC_PROG_CPP
-AC_PROG_RANLIB
AC_PROG_MAKE_SET
AC_PROG_INSTALL
@@ -105,13 +105,8 @@ test ".$with_modules" = .yes && with_modules=`echo $module_list | sed -e 's/ */
if test ".$with_modules" != .no; then
echo ''
$shtool echo -e "Checking for %Bloadable modules%b support"
- AC_LIBTOOL_WIN32_DLL
- AC_LIBLTDL_CONVENIENCE
- AC_ENABLE_SHARED
- AC_DISABLE_STATIC
- AC_LIBTOOL_DLOPEN
- AC_LIBTOOL_SETUP
- AC_PROG_LIBTOOL
+ LT_INIT([dlopen win32-dll shared disable-static])
+ LTDL_INIT([])
case ,$with_modules, in
*,intl:gettext,* )
@@ -157,10 +152,6 @@ fi
test ".$with_modules" = . && with_modules=none
-AC_LIB_LTDL
-AC_SUBST(INCLTDL)
-AC_SUBST(LIBLTDL)
-
AC_MSG_CHECKING([which modules to compile])
AC_MSG_RESULT([$with_modules])
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 3a2be18..665b1a9 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -40,6 +40,9 @@ $(PROGRAM):
EXTRA_DIST = mp4h.mp4h list-tags html.out pod.out texinfo.out
+html.out pod.out texinfo.out:
+ : # defeat GNU make's implicit rules
+
CLEANFILES = \
mp4h.pod mp4h.1 \
mp4h.html \
diff --git a/intl/Makefile.in b/intl/Makefile.in
index 19ed4a7..5ddaba6 100644
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -39,8 +39,7 @@ subdir = intl
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
+mkinstalldirs = $(install_sh) -d
l = @INTL_LIBTOOL_SUFFIX_PREFIX@
diff --git a/modules/example/Makefile.am b/modules/example/Makefile.am
index fafba10..b36251d 100644
--- a/modules/example/Makefile.am
+++ b/modules/example/Makefile.am
@@ -1,6 +1,6 @@
INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/src @INTLINCL@
-LDFLAGS = -no-undefined -module -avoid-version -rpath $(pkglibdir) @DLLDFLAGS@
+AM_LDFLAGS = -no-undefined -module -avoid-version -rpath $(pkglibdir) @DLLDFLAGS@
if DO_MODULE_TEST
noinst_LTLIBRARIES = test.la
diff --git a/modules/intl/Makefile.am b/modules/intl/Makefile.am
index aab636a..fa50340 100644
--- a/modules/intl/Makefile.am
+++ b/modules/intl/Makefile.am
@@ -13,7 +13,7 @@ TESTFILES = gettext.mp4h
man3ext = 3
INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/src @INTLINCL@
-LDFLAGS = -no-undefined -module -avoid-version -rpath $(mp4mdir) @DLLDFLAGS@
+AM_LDFLAGS = -no-undefined -module -avoid-version -rpath $(mp4mdir) @DLLDFLAGS@
if DO_MODULE_INTL_GETTEXT
mp4m_LTLIBRARIES = gettext.la
diff --git a/modules/javascript/Makefile.am b/modules/javascript/Makefile.am
index 8dd230c..e08f490 100644
--- a/modules/javascript/Makefile.am
+++ b/modules/javascript/Makefile.am
@@ -5,7 +5,7 @@ thisdir = javascript
mp4mdir = $(pkglibdir)/@VERSION@/$(thisdir)
INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/src @INTLINCL@
-LDFLAGS = -no-undefined -module -avoid-version -rpath $(mp4mdir) @DLLDFLAGS@
+AM_LDFLAGS = -no-undefined -module -avoid-version -rpath $(mp4mdir) @DLLDFLAGS@
if DO_MODULE_JAVASCRIPT_MOZJS
MODULE_JAVASCRIPT_MOZJS = mozjs.la
diff --git a/modules/system/Makefile.am b/modules/system/Makefile.am
index 0fcf7c1..8e6b218 100644
--- a/modules/system/Makefile.am
+++ b/modules/system/Makefile.am
@@ -13,7 +13,7 @@ TESTFILES = sh.mp4h
man3ext = 3
INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/src @INTLINCL@
-LDFLAGS = -no-undefined -module -avoid-version -rpath $(mp4mdir) @DLLDFLAGS@
+AM_LDFLAGS = -no-undefined -module -avoid-version -rpath $(mp4mdir) @DLLDFLAGS@
if DO_MODULE_SYSTEM
mp4m_LTLIBRARIES = sh.la exec.la
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index 6508e67..329c9e2 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -28,8 +28,7 @@ gettextsrcdir = $(datadir)/gettext/po
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
+mkinstalldirs = $(install_sh) -d
CC = @CC@
GMSGFMT = @GMSGFMT@
diff --git a/src/Makefile.am b/src/Makefile.am
index 2e43b62..7c2973a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
-INCLUDES = -I$(top_srcdir)/pcre -I$(top_srcdir)/lib @INTLINCL@
+INCLUDES = -I$(top_srcdir)/pcre -I$(top_srcdir)/lib @INTLINCL@ $(LTDLINCL)
bin_PROGRAMS = mp4h
@@ -8,7 +8,8 @@ EXTRA_mp4h_SOURCES = module.c
EXTRA_DIST = readme.tmpl
if LOADABLE_MODULES
-MODULE_C = module.c ltdl.c
+MODULE_C = module.c
+MODULE_LDADD = $(LIBLTDL)
endif
mp4h_SOURCES = builtin.c debug.c devel.c freeze.c input.c \
@@ -16,8 +17,8 @@ mp4h_SOURCES = builtin.c debug.c devel.c freeze.c input.c \
if LOADABLE_MODULES
mp4h_LDFLAGS = -export-dynamic
endif
-mp4h_LDADD = -lm $(top_builddir)/lib/libmp4h.a $(top_builddir)/pcre/libpcre.a @INTLLIBS@
+mp4h_LDADD = -lm $(top_builddir)/lib/libmp4h.a $(top_builddir)/pcre/libpcre.a @INTLLIBS@ $(MODULE_LDADD)
include_HEADERS = mp4h.h
-noinst_HEADERS = builtin.h ltdl.h
+noinst_HEADERS = builtin.h
diff --git a/src/ltdl.c.patch b/src/ltdl.c.patch
deleted file mode 100644
index a6fbf64..0000000
--- a/src/ltdl.c.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- ltdl.c Tue Jun 11 18:23:20 2002
-+++ ltdl.c Sun Jun 30 23:23:36 2002
-@@ -2039,7 +2039,7 @@
- }
-
- /* try to open the not-installed module */
-- if (!installed)
-+ if (!installed && objdir)
- {
- if (tryall_dlopen_module (handle, dir, objdir, dlname) == 0)
- return 0;
-@@ -2047,7 +2047,7 @@
-
- /* maybe it was moved to another directory */
- {
-- if (tryall_dlopen_module (handle,
-+ if (dir && tryall_dlopen_module (handle,
- (const char *) 0, dir, dlname) == 0)
- return 0;
- }
-@@ -2691,10 +2691,6 @@
- }
- #endif
- }
-- if (!file)
-- {
-- file = fopen (filename, LT_READTEXT_MODE);
-- }
-
- /* If we didn't find the file by now, it really isn't there. Set
- the status flag, and bail out. */
-@@ -2990,7 +2986,7 @@
- failed, it is better to return an error message here than to
- report FILE_NOT_FOUND when the alternatives (foo.so etc) are not
- in the module search path. */
-- if (handle || ((errors > 0) && file_not_found ()))
-+ if (handle || ((errors > 0) && !file_not_found ()))
- {
- LT_DLFREE (tmp);
- return handle;
diff --git a/Makefile.am b/Makefile.am
index 5034f74..6a88ebd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,12 +2,12 @@
AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I m4
-DIST_SUBDIRS = intl pcre lib src po doc modules tests
+DIST_SUBDIRS = pcre lib src po doc modules tests
if LOADABLE_MODULES
-SUBDIRS = intl pcre lib src po doc modules tests
+SUBDIRS = pcre lib src po doc modules tests
else
-SUBDIRS = intl pcre lib src po doc tests
+SUBDIRS = pcre lib src po doc tests
endif
EXTRA_DIST = CREDITS README README.pcre bootstrap.sh shtool
diff --git a/configure.ac b/configure.ac
index 92badef..d2a9162 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,27 +18,6 @@ $shtool echo -e "Configuring for %B$PACKAGE_NAME $PACKAGE_VERSION ($PACKAGE_DATE
AM_INIT_AUTOMAKE([$PACKAGE_NAME], [$PACKAGE_VERSION])
AM_MAINTAINER_MODE
-if test x$datadir = 'x${prefix}/share'; then
- if test x$prefix = xNONE; then
- MP4HDATADIR="$ac_default_prefix/share/mp4h"
- else
- MP4HDATADIR="$prefix/share/mp4h"
- fi
-else
- MP4HDATADIR="$datadir/mp4h"
-fi
-if test x$libdir = 'x${exec_prefix}/lib'; then
- if test x$prefix = xNONE; then
- MP4HLIBDIR="$ac_default_prefix/lib/mp4h"
- else
- MP4HLIBDIR="$prefix/lib/mp4h"
- fi
-else
- MP4HLIBDIR="$libdir/mp4h"
-fi
-AC_DEFINE_UNQUOTED([MP4HLIBDIR], ["$MP4HLIBDIR/$PACKAGE_VERSION:$MP4HDATADIR"],
- [Default location for mp4h modules])
-
AC_PROG_CC
AC_PROG_CPP
AC_PROG_MAKE_SET
@@ -80,13 +59,8 @@ AC_MSG_RESULT([no])
AC_SUBST([TIDY])
ALL_LINGUAS=
-AM_GNU_GETTEXT
-
+AM_GNU_GETTEXT([external])
-if test ".$USE_INCLUDED_LIBINTL" = .yes; then
- INTLINCL='-I$(top_srcdir)/intl'
- AC_SUBST([INTLINCL])
-fi
MP4H_LOADABLE_MODULES
@@ -166,10 +140,10 @@ AM_CONDITIONAL([DO_MODULE_WML], [test ".$_do_module_wml" = .1])
dnl This line is needed for Debian builds
AC_SUBST(CFLAGS)
+AC_SUBST([INTLINCL], [])
AC_CONFIG_FILES([
Makefile
- intl/Makefile
pcre/Makefile
lib/Makefile
src/Makefile
diff --git a/modules/intl/Makefile.am b/modules/intl/Makefile.am
index fa50340..627d3f5 100644
--- a/modules/intl/Makefile.am
+++ b/modules/intl/Makefile.am
@@ -24,7 +24,7 @@ endif
gettext_la_SOURCES = gettext.c
gettext_la_LDFLAGS = -module
-gettext_la_LIBADD = @INTLLIBS@
+gettext_la_LIBADD = @LTLIBINTL@
EXTRA_DIST = $(SRCFILES) $(TESTFILES)
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..7ebd306
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1,41 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file. Set this to the copyright holder of the surrounding
+# package. (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.) Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright. The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = Denis Barbier
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+# in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+# understood.
+# - Strings which make invalid assumptions about notation of date, time or
+# money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS = pkg-wml-maintainers@lists.alioth.debian.org
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used. It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
diff --git a/src/Makefile.am b/src/Makefile.am
index 7c2973a..3a73192 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,8 +17,13 @@ mp4h_SOURCES = builtin.c debug.c devel.c freeze.c input.c \
if LOADABLE_MODULES
mp4h_LDFLAGS = -export-dynamic
endif
-mp4h_LDADD = -lm $(top_builddir)/lib/libmp4h.a $(top_builddir)/pcre/libpcre.a @INTLLIBS@ $(MODULE_LDADD)
+mp4h_LDADD = -lm $(top_builddir)/lib/libmp4h.a $(top_builddir)/pcre/libpcre.a @LTLIBINTL@ $(MODULE_LDADD)
include_HEADERS = mp4h.h
noinst_HEADERS = builtin.h
+MP4HLIBDIR= ${libdir}/mp4h
+MP4HDATADIR= ${datadir}/mp4h
+MP4H_PATH= ${MP4HLIBDIR}/${PACKAGE_VERSION}:${MP4HDATADIR}
+
+AM_CPPFLAGS= -D"MP4HLIBDIR=\"${MP4H_PATH}\""
diff --git a/doc/mp4h.mp4h b/doc/mp4h.mp4h
index 383159a..fcc8ebb 100755
--- a/doc/mp4h.mp4h
+++ b/doc/mp4h.mp4h
@@ -836,7 +836,7 @@ it is set to the second argument.
</tag:description>
<para>
-Show informations on symbols. If it is a variable name, the <command
+Show information on symbols. If it is a variable name, the <command
STRING /> word is printed as well as the number of lines contained within
this variable.
@@ -1892,7 +1892,7 @@ Returns <true/> if file exists.
</tag:description>
<para>
-Returns an array of informations on this file. These informations are:
+Returns an array of information on this file. These information are:
size, type, ctime, mtime, atime, owner and group.
</para>
@@ -2133,7 +2133,7 @@ macro used to generate all examples of this documentation is
</tag:description>
<para>
-This comand acts like the <optflag d /> flag but can be ynamically
+This command acts like the <optflag d /> flag but can be ynamically
changed.
</para>
@@ -2158,7 +2158,7 @@ being processed.
</tag:description>
<para>
-Declare these macros traced, i.e. informations about these macros will
+Declare these macros traced, i.e. information about these macros will
be printed if <optflag d /> flag or <command debugmode /> macro are used.
</para>
@@ -2257,7 +2257,7 @@ A format specification as used with the strftime(3) C library routine.
<para>
Prints the time spent since last call to this macro. The printed value
-is the number of clock ticks, and so is dependant of your CPU.
+is the number of clock ticks, and so is dependent of your CPU.
</para>
<example>
@@ -2519,7 +2519,7 @@ Macros are characterized by
<item>container status (simple or complex)</item>
<item>if attributes are expanded or not</item>
<item>function type (primitive or user defined macro)</item>
-<item>for primitives, adress of corresponding code in memory and for
+<item>for primitives, address of corresponding code in memory and for
user defined macros the replacement text</item>
</list>
@@ -2652,7 +2652,7 @@ and footers with
<define-tag header>
<html*>
<head>
-... put here some informations ....
+... put here some information ....
</head>
<body* bgcolor="#ffffff" text="#000000">
</define-tag>
diff --git a/src/builtin.c b/src/builtin.c
index c861799..694531a 100644
--- a/src/builtin.c
+++ b/src/builtin.c
@@ -1312,7 +1312,7 @@ mp4h_bp_function_def (MP4H_BUILTIN_ARGS)
#ifdef HAVE_FILE_FUNCS
/*-----------------------------------------------------------------.
-| Informations on a file. A newline separated string is printed: |
+| Information on a file. A newline separated string is printed: |