mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-24 07:20:37 +00:00
Code Issues Releases Activity

fix compilation when modules are enabled

Browse Source
This commit is contained in:
Andrea Corallo 2019-10-24 14:36:28 +02:00
parent adac6fa11a
commit 1d3c0d1716
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
configure.ac
View File

@ -3671,23 +3671,6 @@ if test "${HAVE_ZLIB}" = "yes"; then
fi
AC_SUBST(LIBZ)
### Emacs Lisp native compiler support
HAVE_NATIVE_COMP=no
LIBGCCJIT_LIB=
COMP_OBJ=
if test "${with_nativecomp}" != "no"; then
AC_CHECK_LIB(gccjit, gcc_jit_context_acquire, HAVE_NATIVE_COMP=yes, , -lgccjit)
if test "${HAVE_NATIVE_COMP}" = "yes"; then
LIBGCCJIT_LIB="-lgccjit -ldl"
COMP_OBJ="dynlib.o comp.o"
AC_DEFINE(HAVE_NATIVE_COMP, 1, [Define to 1 if you have the libgccjit library (-lgccjit).])
AC_DEFINE_UNQUOTED(NATIVE_ELISP_SUFFIX, ".eln",
[System extension for native compiled elisp])
fi
fi
AC_SUBST(LIBGCCJIT_LIB)
AC_SUBST(COMP_OBJ)
### Dynamic modules support
LIBMODULES=
HAVE_MODULES=no
@ -3754,6 +3737,28 @@ module_env_snippet_28="$srcdir/src/module-env-28.h"
emacs_major_version="${PACKAGE_VERSION%%.*}"
AC_SUBST(emacs_major_version)
### Emacs Lisp native compiler support
HAVE_NATIVE_COMP=no
LIBGCCJIT_LIB=
COMP_OBJ=
if test "${with_nativecomp}" != "no"; then
AC_CHECK_LIB(gccjit, gcc_jit_context_acquire, HAVE_NATIVE_COMP=yes, , -lgccjit)
if test "${HAVE_NATIVE_COMP}" = "yes"; then
LIBGCCJIT_LIB="-lgccjit -ldl"
if test "${HAVE_MODULES}" = yes; then
COMP_OBJ="comp.o"
else
COMP_OBJ="dynlib.o comp.o"
fi
AC_DEFINE(HAVE_NATIVE_COMP, 1, [Define to 1 if you have the libgccjit library (-lgccjit).])
AC_DEFINE_UNQUOTED(NATIVE_ELISP_SUFFIX, ".eln",
[System extension for native compiled elisp])
fi
fi
AC_SUBST(LIBGCCJIT_LIB)
AC_SUBST(COMP_OBJ)
### Use -lpng if available, unless '--with-png=no'.
HAVE_PNG=no
LIBPNG=