mirror of https://github.com/djcb/mu.git
guile: avoid need for muldef
This commit is contained in:
parent
72d9dba7cc
commit
6b8ccff572
17
configure.ac
17
configure.ac
|
@ -53,12 +53,6 @@ AX_CXX_COMPILE_STDCXX_14
|
|||
m4_ifdef([AX_COMPILER_FLAGS],[AX_COMPILER_FLAGS(,,[yes],${extra_flags})])
|
||||
AX_VALGRIND_CHECK
|
||||
|
||||
# i.e,., do we hgave -z muldefs?, if not (MacOS), we can't
|
||||
# build the guile backend
|
||||
AX_CHECK_LINK_FLAG([-z muldefs])dnl
|
||||
AM_CONDITIONAL([LD_ALLOW_Z_MULDEF],
|
||||
[test "x$ax_cv_check_ldflags___z_muldefs" = xyes])dnl
|
||||
|
||||
LT_INIT
|
||||
|
||||
AX_CODE_COVERAGE
|
||||
|
@ -220,10 +214,9 @@ AM_CONDITIONAL(BUILD_GUI,[test "x$have_webkit" = "xyes" -a "x$have_gtk" = "xyes"
|
|||
###############################################################################
|
||||
# build with guile 3.0/2.2 when available and not disabled.
|
||||
AC_ARG_ENABLE([guile], AS_HELP_STRING([--disable-guile],[Disable guile]))
|
||||
AM_COND_IF([LD_ALLOW_Z_MULDEF],[
|
||||
AS_IF([test "x$enable_guile" != "xno"],[
|
||||
PKG_CHECK_MODULES(GUILE, [guile-3.0], [have_guile=yes],[
|
||||
PKG_CHECK_MODULES(GUILE, [guile-2.2], [have_guile=yes], [have_guile=no])])
|
||||
AS_IF([test "x$enable_guile" != "xno"],[
|
||||
PKG_CHECK_MODULES(GUILE, [guile-3.0], [have_guile=yes],[
|
||||
PKG_CHECK_MODULES(GUILE, [guile-2.2], [have_guile=yes], [have_guile=no])])
|
||||
AS_IF([test "x$have_guile" = "xyes"],[
|
||||
GUILE_PKG([3.0 2.2])
|
||||
GUILE_PROGS
|
||||
|
@ -232,9 +225,7 @@ AM_COND_IF([LD_ALLOW_Z_MULDEF],[
|
|||
AC_DEFINE(BUILD_GUILE,[1], [Do we support Guile?])
|
||||
AC_SUBST(GUILE_SNARF, [guile-snarf])
|
||||
guile_version=$($PKG_CONFIG guile-$GUILE_EFFECTIVE_VERSION --modversion)
|
||||
])
|
||||
])],[
|
||||
AC_MSG_NOTICE([no muldef support, so no guile atm])
|
||||
])
|
||||
])
|
||||
AM_CONDITIONAL(BUILD_GUILE,[test "x$have_guile" = "xyes"])
|
||||
###############################################################################
|
||||
|
|
|
@ -48,8 +48,7 @@ libguile_mu_la_LIBADD= \
|
|||
libguile_mu_la_LDFLAGS= \
|
||||
$(ASAN_LDFLAGS) \
|
||||
-shared \
|
||||
-export-dynamic \
|
||||
-Wl,-z,muldefs
|
||||
-export-dynamic
|
||||
|
||||
XFILES= \
|
||||
mu-guile.x \
|
||||
|
|
|
@ -118,7 +118,6 @@ libmu_la_LIBADD= \
|
|||
$(GLIB_LIBS) \
|
||||
$(GUILE_LIBS) \
|
||||
$(JSON_GLIB_LIBS) \
|
||||
${builddir}/utils/libmu-utils.la \
|
||||
${builddir}/query/libmu-query.la \
|
||||
${builddir}/index/libmu-index.la \
|
||||
$(CODE_COVERAGE_LIBS)
|
||||
|
|
Loading…
Reference in New Issue