add configure ac patch

diff --git a/debian/patches/fix_configure_ac b/debian/patches/fix_configure_ac
new file mode 100644 (file)
index 0000000..b4c9af0
--- /dev/null
+++ b/debian/patches/fix_configure_ac
@@ -0,0 +1,185 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -135,10 +135,10 @@
+ save_CXXFLAGS="$CXXFLAGS"
+ CXXFLAGS="$GUILE_CFLAGS $CXXFLAGS"
+ AC_CHECK_TYPES([scm_t_hash_fold_fn, scm_t_hash_handle_fn],
+-             [AC_DEFINE(HAVE_GUILE_HASH_FUNC)], [],
++             [AC_DEFINE([HAVE_GUILE_HASH_FUNC], [], [guile hash func])], [],
+              [#include <libguile.h>])
+ AC_CHECK_TYPES([scm_t_subr],
+-             [AC_DEFINE(HAVE_GUILE_SUBR_TYPE)], [],
++             [AC_DEFINE([HAVE_GUILE_SUBR_TYPE], [], [guile subrtype])], [],
+              [#include <libguile.h>])
+ CXXFLAGS="$save_CXXFLAGS"
+ 
+@@ -148,12 +148,12 @@
+ AC_MSG_CHECKING(for usable C++ demangler)
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <cxxabi.h>],
+           [abi::__cxa_demangle ("", 0, 0, 0)])],
+-    [AC_DEFINE(HAVE_CXA_DEMANGLE)
++    [AC_DEFINE([HAVE_CXA_DEMANGLE], [], [cxa demangle])
+       AC_MSG_RESULT(yes)],[
+       LIBS="$LIBS -lsupc++"
+       AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <cxxabi.h>],
+                   [abi::__cxa_demangle ("", 0, 0, 0)])],
+-          [AC_DEFINE(HAVE_CXA_DEMANGLE)
++          [AC_DEFINE([HAVE_CXA_DEMANGLE], [], [cxa demangle])
+               AC_MSG_RESULT([yes, using -lsupc++])
+               CXXABI_LIBS="$CXXABI_LIBS -lsupc++"],
+           [AC_MSG_RESULT([no, use c++filt -t for manual demangling])])])
+@@ -190,7 +190,7 @@
+ 
+ AC_MSG_CHECKING(whether to enable dynamic relocation)
+ if test "$reloc_b" = "yes"; then
+-    AC_DEFINE(ARGV0_RELOCATION)
++    AC_DEFINE([ARGV0_RELOCATION], [], [dynamic relocation])
+ fi
+ AC_MSG_RESULT($reloc_b)
+ 
+@@ -257,7 +257,7 @@
+ STEPMAKE_PROGS(ZIPDOC, zip, $DOCUMENTATION_REQUIRED)
+ STEPMAKE_PROGS(RSYNC, rsync, $DOCUMENTATION_REQUIRED)
+ 
+-AC_DEFINE_UNQUOTED(FLOWER_VERSION, "${FULL_FLOWER_VERSION}")
++AC_DEFINE_UNQUOTED([FLOWER_VERSION], "${FULL_FLOWER_VERSION}", [flower version])
+ 
+ # must also have local.make if configure fails.
+ touch local.make
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -198,7 +198,7 @@
+     [pipe_b=$enableval])
+ 
+     if test "$optimise_b" = yes; then
+-      AC_DEFINE(NDEBUG)
++      AC_DEFINE(NDEBUG, 1, [no debug])
+       DEFINES="$DEFINES -DNDEBUG"
+       OPTIMIZE=" -O2 -finline-functions"
+     fi
+@@ -282,7 +282,7 @@
+     template <class T> int foo<T>::baz = 1;
+     ]], [[ return foo<int>::baz; ]])],[stepmake_cv_need_explicit_instantiation=no],[stepmake_cv_need_explicit_instantiation=yes]))
+     if test x"$stepmake_cv_need_explicit_instantiation"x = x"yes"x; then
+-      AC_DEFINE(NEED_EXPLICIT_INSTANTIATION)
++      AC_DEFINE(NEED_EXPLICIT_INSTANTIATION, [], [Explicit instantiation])
+     fi
+ ])
+ 
+@@ -318,8 +318,8 @@
+     AC_SUBST(datadir)
+     AC_SUBST(datarootdir)
+     AC_SUBST(build_package_datadir)
+-    AC_DEFINE_UNQUOTED(DATADIR, ["${DATADIR}"])
+-    AC_DEFINE_UNQUOTED(BUILD_PACKAGE_DATADIR, ["${BUILD_PACKAGE_DATADIR}"])
++    AC_DEFINE_UNQUOTED(DATADIR, ["${DATADIR}"], [data dir])
++    AC_DEFINE_UNQUOTED(BUILD_PACKAGE_DATADIR, ["${BUILD_PACKAGE_DATADIR}"], [build package data dir])
+ ])
+ 
+ ## ugh: cut & paste programming from datadir. 
+@@ -339,8 +339,8 @@
+     
+     AC_SUBST(libdir)
+     AC_SUBST(build_package_libdir)
+-    AC_DEFINE_UNQUOTED(LIBDIR, ["${LIBDIR}"])
+-    AC_DEFINE_UNQUOTED(BUILD_PACKAGE_LIBDIR, ["${BUILD_PACKAGE_LIBDIR}"])
++    AC_DEFINE_UNQUOTED(LIBDIR, ["${LIBDIR}"], [libdir])
++    AC_DEFINE_UNQUOTED(BUILD_PACKAGE_LIBDIR, ["${BUILD_PACKAGE_LIBDIR}"], [build package libdir])
+ ])
+ 
+ 
+@@ -556,7 +556,7 @@
+     LOCALEDIR=`echo ${localedir} | sed "s!\\\${prefix}!$presome!"`
+     
+     AC_SUBST(localedir)
+-    AC_DEFINE_UNQUOTED(LOCALEDIR, ["${LOCALEDIR}"])
++    AC_DEFINE_UNQUOTED(LOCALEDIR, ["${LOCALEDIR}"], [locale dir])
+     AC_CHECK_LIB(intl, gettext)
+     AC_CHECK_FUNCS(gettext)
+ ])
+@@ -700,9 +700,9 @@
+     fi
+     CPPFLAGS="$save_CPPFLAGS"
+     LIBS="$save_LIBS"
+-    AC_DEFINE_UNQUOTED(GUILE_MAJOR_VERSION, $GUILE_MAJOR_VERSION)
+-    AC_DEFINE_UNQUOTED(GUILE_MINOR_VERSION, $GUILE_MINOR_VERSION)
+-    AC_DEFINE_UNQUOTED(GUILE_PATCH_LEVEL, $GUILE_PATCH_LEVEL)
++    AC_DEFINE_UNQUOTED(GUILE_MAJOR_VERSION, $GUILE_MAJOR_VERSION, [guile major version])
++    AC_DEFINE_UNQUOTED(GUILE_MINOR_VERSION, $GUILE_MINOR_VERSION, [guile minor version])
++    AC_DEFINE_UNQUOTED(GUILE_PATCH_LEVEL, $GUILE_PATCH_LEVEL, [guile patch level])
+ ])
+ 
+ 
+@@ -839,9 +839,9 @@
+     # so stick to macros are uppercase convention.
+     # AC_DEFINE_UNQUOTED(package, ["${package}"])
+     # AC_DEFINE_UNQUOTED(PACKAGE, ["${PACKAGE}"])
+-    AC_DEFINE_UNQUOTED(PACKAGE, ["${package}"])
+-    AC_DEFINE_UNQUOTED(PACKAGE_NAME, ["${PACKAGE_NAME}"])
+-    AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, ["${FULL_VERSION}"])
++    AC_DEFINE_UNQUOTED(PACKAGE, ["${package}"], [package])
++    AC_DEFINE_UNQUOTED(PACKAGE_NAME, ["${PACKAGE_NAME}"], [package name])
++    AC_DEFINE_UNQUOTED(TOPLEVEL_VERSION, ["${FULL_VERSION}"], [full version])
+ 
+     if test -z "$package_depth"; then
+       package_depth="."
+@@ -908,8 +908,8 @@
+     AC_SUBST(ZIP)
+     AC_SUBST(LN)
+     AC_SUBST(LN_S)
+-    AC_DEFINE_UNQUOTED(DIRSEP, ['${DIRSEP}'])
+-    AC_DEFINE_UNQUOTED(PATHSEP, ['${PATHSEP}'])
++    AC_DEFINE_UNQUOTED(DIRSEP, ['${DIRSEP}'], [dirsep])
++    AC_DEFINE_UNQUOTED(PATHSEP, ['${PATHSEP}'], [pathsep])
+     AC_SUBST(DIRSEP)
+     AC_SUBST(PATHSEP)
+     AC_SUBST(ROOTSEP)
+@@ -1253,7 +1253,7 @@
+ AC_DEFUN(STEPMAKE_FREETYPE2, [
+     PKG_CHECK_MODULES(FREETYPE2, $1 >= $3, have_freetype2=yes, true)
+     if test "$have_freetype2" = yes; then
+-      AC_DEFINE(HAVE_FREETYPE2)
++      AC_DEFINE(HAVE_FREETYPE2, 1, [have freetype])
+         save_CPPFLAGS="$CPPFLAGS"
+         save_LIBS="$LIBS"
+       CPPFLAGS="$FREETYPE2_CFLAGS $CPPFLAGS"
+@@ -1274,7 +1274,7 @@
+ AC_DEFUN(STEPMAKE_PANGO, [
+     PKG_CHECK_MODULES(PANGO, $1 >= $3, have_pango16=yes, true)
+     if test "$have_pango16" = yes ; then
+-      AC_DEFINE(HAVE_PANGO16)
++      AC_DEFINE(HAVE_PANGO16, 1, [have pango 16])
+       # Do not pollute user-CPPFLAGS with configure-CPPFLAGS
+         save_CPPFLAGS="$CPPFLAGS"
+         save_LIBS="$LIBS"
+@@ -1298,8 +1298,8 @@
+ AC_DEFUN(STEPMAKE_PANGO_FT2, [
+     PKG_CHECK_MODULES(PANGO_FT2, $1 >= $3, have_pangoft2=yes, true)
+     if test "$have_pangoft2" = yes ; then
+-      AC_DEFINE(HAVE_PANGO16)
+-      AC_DEFINE(HAVE_PANGO_FT2)
++      AC_DEFINE(HAVE_PANGO16, 1, [have pango 16])
++      AC_DEFINE(HAVE_PANGO_FT2, 1, [have pango ft2])
+       # Do not pollute user-CPPFLAGS with configure-CPPFLAGS
+         save_CPPFLAGS="$CPPFLAGS"
+         save_LIBS="$LIBS"
+@@ -1323,7 +1323,7 @@
+ AC_DEFUN(STEPMAKE_FONTCONFIG, [
+     PKG_CHECK_MODULES(FONTCONFIG, $1 >= $3, have_fontconfig=yes, true)
+     if test "$have_fontconfig" = yes ; then
+-      AC_DEFINE(HAVE_FONTCONFIG)
++      AC_DEFINE(HAVE_FONTCONFIG, 1, [have fontconfig])
+       # Do not pollute user-CPPFLAGS with configure-CPPFLAGS
+         save_CPPFLAGS="$CPPFLAGS"
+         save_LIBS="$LIBS"
+@@ -1358,8 +1358,8 @@
+ 
+     AC_SUBST(LN)
+     AC_SUBST(LN_S)
+-    AC_DEFINE_UNQUOTED(DIRSEP, ['${DIRSEP}'])
+-    AC_DEFINE_UNQUOTED(PATHSEP, ['${PATHSEP}'])
++    AC_DEFINE_UNQUOTED(DIRSEP, ['${DIRSEP}'], [dir sep])
++    AC_DEFINE_UNQUOTED(PATHSEP, ['${PATHSEP}'], [path sep])
+     AC_SUBST(DIRSEP)
+     AC_SUBST(PATHSEP)
+     AC_SUBST(program_suffix)

diff --git a/debian/patches/series b/debian/patches/series
index 64f8ef4e0cc25f649a30ef680f704b64fb8dd5c6..b8cdefc2a6707a1a065e047d76ecdd92d39d99e1 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ hurd_file_name_support
 more_debug_output_during_build
 use_cstring_and_ctype_includes
 use_debians_help2man
+fix_configure_ac