--- a/libeantic/configure.ac 2021-06-25 08:06:12.000000000 -0600 +++ b/libeantic/configure.ac 2021-06-26 16:49:08.179099722 -0600 @@ -28,8 +28,6 @@ AC_PROG_INSTALL dnl We build our library with libtool. LT_INIT -AC_CONFIG_LIBOBJ_DIR([upstream/patched]) - ## Test for valgrind test suite AX_VALGRIND_DFLT([sgcheck], [off]) AX_VALGRIND_DFLT([drd], [off]) @@ -55,15 +53,6 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ AC_CHECK_HEADERS(antic/nf.h antic/nf_elem.h, , [AC_MSG_ERROR([antic headers not found])]) AC_CHECK_LIB(antic, nf_init, [], [AC_MSG_ERROR([libantic not found])]) -# Check if we need to provide our own nf_init_randtest which was introduced in https://github.com/wbhart/antic/pull/47 -AC_REPLACE_FUNCS(nf_init_randtest) -# Unconditionally patch nf_elem_scalar_div_fmpq which has aliasing issues in ANTIC, https://github.com/wbhart/antic/pull/48 -AC_LIBOBJ(EANTIC_nf_elem_scalar_div_fmpq) -# Unconditionally patch fmpq_poly_add_fmpq which was fixed in https://github.com/wbhart/flint2/commit/17d26d4c957828f3c98c15ddec85108f841d3438 -AC_LIBOBJ(EANTIC_fmpq_poly_add_fmpq) -# Unconditionally patch nf_elem_add_fmpq so it uses our patched fmpq_poly_add_fmpq -AC_LIBOBJ(EANTIC_nf_elem_add_fmpq) - AC_CHECK_HEADERS(arb.h arf.h, , [AC_MSG_ERROR([Arb header not found])]) AC_SEARCH_LIBS(arb_init, [arb flint-arb],[], [AC_MSG_ERROR([libarb not found])]) --- a/libeantic/e-antic/renf_elem.h 2021-06-25 08:06:12.000000000 -0600 +++ b/libeantic/e-antic/renf_elem.h 2021-06-26 19:22:54.519464883 -0600 @@ -33,12 +33,6 @@ extern "C" { #define EANTIC_STR_D 2 #define EANTIC_STR_ARB 4 -// Patch nf_elem_scalar_div & nf_elem_add_fmpq which have issues in the released version of ANTIC, see upstream/patched. -LIBEANTIC_API void EANTIC_nf_elem_scalar_div_fmpq(nf_elem_t a, const nf_elem_t b, const fmpq_t c, const nf_t nf); -#define nf_elem_scalar_div_fmpq(a, b, c, nf) EANTIC_nf_elem_scalar_div_fmpq(a, b, c, nf) -LIBEANTIC_API void EANTIC_nf_elem_add_fmpq(nf_elem_t a, const nf_elem_t b, const fmpq_t c, const nf_t nf); -#define nf_elem_add_fmpq(a, b, c, nf) EANTIC_nf_elem_add_fmpq(a, b, c, nf) - /// === Memory Layout === /// A real embedded number field element typedef struct LIBEANTIC_API renf_elem --- a/libeantic/Makefile.am 2021-06-25 08:06:12.000000000 -0600 +++ b/libeantic/Makefile.am 2021-06-26 16:49:45.610145920 -0600 @@ -5,20 +5,3 @@ endif SUBDIRS = src srcxx test $(MAYBE_BENCHMARK) ACLOCAL_AMFLAGS = -I m4 - -# Distribute files that we might need to fill/replace from our dependencies -EXTRA_DIST = \ - upstream/patched/EANTIC_fmpq_poly_add_fmpq.c \ - upstream/patched/EANTIC_nf_elem_add_fmpq.c \ - upstream/patched/EANTIC_nf_elem_scalar_div_fmpq.c \ - upstream/patched/fmpq_poly_add_fmpq.c \ - upstream/patched/nf.h \ - upstream/patched/nf_elem.h \ - upstream/patched/nf_elem_add_fmpq.c \ - upstream/patched/nf_elem_scalar_div_fmpq.c \ - upstream/patched/nf_init_randtest.c - -# Probably a bug in autotools: -# .libs in AC_CONFIG_LIBOBJ_DIR is not cleaned automatically. -mostlyclean-local: - -rm -rf upstream/patched/.libs