diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2010-02-17 22:09:25 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2010-02-17 22:09:25 +0100 |
| commit | 762d7367f5f74f877ec75986e19fc9d46eef5164 (patch) | |
| tree | c5ce3f772f278f752ea8c08c2281c9a0b89bddaf /buildlib | |
| parent | ac83edae692c6c7dda7e41e3b27f5cbff0473629 (diff) | |
| parent | 07f2526e45f9978201817237745727db6177c29a (diff) | |
merged from debian-sid
Diffstat (limited to 'buildlib')
| -rw-r--r-- | buildlib/po4a_manpage.mak | 2 | ||||
| -rw-r--r-- | buildlib/tools.m4 | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak index dfa215d29..6eec9d031 100644 --- a/buildlib/po4a_manpage.mak +++ b/buildlib/po4a_manpage.mak @@ -57,5 +57,5 @@ endif # Debian Doc SGML Documents SOURCE := $(wildcard *.$(LC).sgml) -DEBIANDOC_HTML_OPTIONS=-l $(LC) +DEBIANDOC_HTML_OPTIONS=-l $(LC).UTF-8 include $(DEBIANDOC_H) diff --git a/buildlib/tools.m4 b/buildlib/tools.m4 index d1d692331..433d5ca32 100644 --- a/buildlib/tools.m4 +++ b/buildlib/tools.m4 @@ -1,4 +1,4 @@ -AC_DEFUN(ah_HAVE_GETCONF, +AC_DEFUN([ah_HAVE_GETCONF], [AC_ARG_WITH(getconf, [ --with-getconf Enable automagical buildtime configuration], [if test "$withval" = "yes"; then @@ -14,7 +14,7 @@ AC_DEFUN(ah_HAVE_GETCONF, ]) dnl ah_GET_CONF(variable, value ..., [default]) -AC_DEFUN(ah_GET_GETCONF, +AC_DEFUN([ah_GET_GETCONF], [AC_REQUIRE([ah_HAVE_GETCONF]) if test ! -z "$GETCONF";then old_args="[$]@" @@ -28,7 +28,7 @@ AC_DEFUN(ah_GET_GETCONF, eval $1="$3" fi ]) -AC_DEFUN(ah_NUM_CPUS, +AC_DEFUN([ah_NUM_CPUS], [AC_MSG_CHECKING([number of cpus]) AC_ARG_WITH(cpus, [ --with-cpus The number of cpus to be used for building(see --with-procs, default 1)], @@ -56,7 +56,7 @@ AC_DEFUN(ah_NUM_CPUS, AC_MSG_RESULT([$ah_NUM_CPUS_msg]) AC_SUBST(NUM_CPUS) ]) -AC_DEFUN(ah_PROC_MULTIPLY, +AC_DEFUN([ah_PROC_MULTIPLY], [AC_REQUIRE([ah_NUM_CPUS]) AC_MSG_CHECKING([processor multiplier]) AC_ARG_WITH(proc-multiply, @@ -72,7 +72,7 @@ AC_DEFUN(ah_PROC_MULTIPLY, AC_SUBST(PROC_MULTIPLY) ]) -AC_DEFUN(ah_NUM_PROCS, +AC_DEFUN([ah_NUM_PROCS], [AC_REQUIRE([ah_PROC_MULTIPLY]) AC_REQUIRE([ah_NUM_CPUS]) AC_MSG_CHECKING([number of processes to run during make]) @@ -89,7 +89,7 @@ AC_DEFUN(ah_NUM_PROCS, AC_SUBST(NUM_PROCS) ]) -AC_DEFUN(ah_GCC3DEP,[ +AC_DEFUN([ah_GCC3DEP],[ AC_MSG_CHECKING(if $CXX -MD works) touch gcc3dep.cc ${CXX-c++} -MD -o gcc3dep_test.o -c gcc3dep.cc |