Control: tag -1 patch

Here's a patch that enables building with guile-2.0. However, some of
the tests fail now with what looks like rounding errors.

Cheers,
-Hilko

diff --git a/configure.in b/configure.in
index fe3f2b5..350f8fa 100644
--- a/configure.in
+++ b/configure.in
@@ -60,10 +60,11 @@ dnl Checks for library functions.
 AC_CHECK_FUNCS([bzero memset], [break])
 
 dnl Additional Guile feature checks.
+CFLAGS="$CFLAGS $GUILE_CFLAGS"
 AC_CHECK_TYPE([scm_t_bits], [AC_DEFINE([HAVE_SCM_T_BITS], [1], [Define to 1 if you have the `scm_t_bits' type.])], [], [#include <libguile.h>])
-AC_CHECK_LIB([guile], [scm_c_define_gsubr], [AC_DEFINE([HAVE_SCM_C_DEFINE_GSUBR], [1], [Define to 1 if you have the `scm_c_define_gsubr' function.])], [], [$GUILE_LDFLAGS])
-AC_CHECK_LIB([guile], [scm_make_gsubr], [AC_DEFINE([HAVE_SCM_MAKE_GSUBR], [1], [Define to 1 if you have the `scm_make_gsubr' function.])], [], [$GUILE_LDFLAGS])
-AC_CHECK_LIB([guile], [scm_num2dbl], [AC_DEFINE([HAVE_SCM_NUM2DBL], [1], [Define to 1 if you have the `scm_num2dbl' function.])], [], [$GUILE_LDFLAGS])
+AC_CHECK_LIB([guile-2.0], [scm_c_define_gsubr], [AC_DEFINE([HAVE_SCM_C_DEFINE_GSUBR], [1], [Define to 1 if you have the `scm_c_define_gsubr' function.])], [], [$GUILE_LDFLAGS])
+AC_CHECK_LIB([guile-2.0], [scm_make_gsubr], [AC_DEFINE([HAVE_SCM_MAKE_GSUBR], [1], [Define to 1 if you have the `scm_make_gsubr' function.])], [], [$GUILE_LDFLAGS])
+AC_CHECK_LIB([guile-2.0], [scm_num2dbl], [AC_DEFINE([HAVE_SCM_NUM2DBL], [1], [Define to 1 if you have the `scm_num2dbl' function.])], [], [$GUILE_LDFLAGS])
 
 AC_CONFIG_FILES([Makefile doc/Makefile lib/Makefile])
 AC_OUTPUT(libmatheval.pc)
diff --git a/debian/control b/debian/control
index 831f578..de68d19 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Julian Taylor <[email protected]>
 Build-Depends: debhelper (>= 9),
                dh-autoreconf,
                flex (>= 2.5.33-6),
-               guile-1.8-dev,
+               guile-2.0-dev,
                libltdl-dev,
                texinfo
 Standards-Version: 3.9.5
diff --git a/debian/rules b/debian/rules
index 3f46d05..8d83301 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,9 +5,9 @@ export DH_VERBOSE=1
 %:
 	dh $@ --with autoreconf --as-needed
 
-override_dh_auto_configure:
-	# #384957
-	dh_auto_configure -- LEXLIB="-lfl_pic"
+override_dh_autoreconf:
+	touch config/config.rpath
+	dh_autoreconf
 
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS
-- 
2.1.0

Reply via email to