luke
/
magic
mirror of https://github.com/RTimothyEdwards/magic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure: --enable-assertions make this a user accessible config 

This should help with automated CI testing as well, where a suite
can be run and assertions enabled and checked, just via a specific
CI setup.
This commit is contained in:
Darryl L. Miles 2024-10-17 10:56:15 +01:00 committed by R. Timothy Edwards
parent 2a78de8cb9
commit dd49ca21d2
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/configure.in
View File

@ -196,6 +196,17 @@ then
AC_DEFINE(HAVE___VA_COPY, 1, [Define if we have __va_copy]) AC_DEFINE(HAVE___VA_COPY, 1, [Define if we have __va_copy])
fi fi
dnl Control assertions in codebase from configure
AC_ARG_ENABLE(assertions,
[ --enable-assertions build with fatal assertions enabled],
[],
[enable_assertions=no])
NDEBUG_defs="-DNDEBUG"
if test "x$enable_assertions" = "xyes" ; then
NDEBUG_defs=""
fi
dnl Allow file compression (zlib) to be disabled dnl Allow file compression (zlib) to be disabled
AC_ARG_ENABLE(compression, AC_ARG_ENABLE(compression,
[ --disable-compression disable file compression], [ --disable-compression disable file compression],
@ -1812,6 +1823,7 @@ AC_SUBST(SCRIPTS)
AC_SUBST(extra_libs) AC_SUBST(extra_libs)
AC_SUBST(extra_defs) AC_SUBST(extra_defs)
AC_SUBST(stub_defs) AC_SUBST(stub_defs)
AC_SUBST(NDEBUG_defs)
AC_SUBST(ld_extra_libs) AC_SUBST(ld_extra_libs)
AC_SUBST(ld_extra_objs) AC_SUBST(ld_extra_objs)
AC_SUBST(top_extra_libs) AC_SUBST(top_extra_libs)

6
scripts/defs.mak.in
View File

@ -94,9 +94,9 @@ CXX = @CXX@
CPPFLAGS = -I${MAGICDIR} @CPPFLAGS@ CPPFLAGS = -I${MAGICDIR} @CPPFLAGS@
DFLAGS_MAGICVERSION = -DMAGIC_VERSION=\"${MAGIC_VERSION}\" -DMAGIC_REVISION=\"${MAGIC_REVISION}\" -DMAGIC_COMMIT=\"${MAGIC_COMMIT}\" "-DMAGIC_BUILDDATE=\"${MAGIC_BUILDDATE}\"" DFLAGS_MAGICVERSION = -DMAGIC_VERSION=\"${MAGIC_VERSION}\" -DMAGIC_REVISION=\"${MAGIC_REVISION}\" -DMAGIC_COMMIT=\"${MAGIC_COMMIT}\" "-DMAGIC_BUILDDATE=\"${MAGIC_BUILDDATE}\""
DFLAGS = @extra_defs@ @stub_defs@ @DEFS@ ${DFLAGS_MAGICVERSION} -DGCORE=\"@GCORE@\" DFLAGS = @extra_defs@ @stub_defs@ @DEFS@ ${DFLAGS_MAGICVERSION} -DGCORE=\"@GCORE@\"
DFLAGS += -DSHDLIB_EXT=\"@SHDLIB_EXT@\" -DNDEBUG DFLAGS += -DSHDLIB_EXT=\"@SHDLIB_EXT@\" @NDEBUG_defs@
DFLAGS_NOSTUB = @extra_defs@ @DEFS@ ${DFLAGS_MAGICVERSION} -DGCORE=\"@GCORE@\" DFLAGS_NOSTUB = @extra_defs@ @DEFS@ ${DFLAGS_MAGICVERSION} -DGCORE=\"@GCORE@\"
DFLAGS_NOSTUB += -DSHDLIB_EXT=\"@SHDLIB_EXT@\" -DNDEBUG DFLAGS_NOSTUB += -DSHDLIB_EXT=\"@SHDLIB_EXT@\" @NDEBUG_defs@
CFLAGS = @CFLAGS@ @SHLIB_CFLAGS@ @INC_SPECS@ CFLAGS = @CFLAGS@ @SHLIB_CFLAGS@ @INC_SPECS@
READLINE_DEFS = @rl_defs@ READLINE_DEFS = @rl_defs@
@ -107,7 +107,7 @@ DEPEND_FLAG = @DEPEND_FLAG@
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@
GR_CFLAGS = @X_CFLAGS@ @gr_cflags@ GR_CFLAGS = @X_CFLAGS@ @gr_cflags@
GR_DFLAGS = @gr_dflags@ -DNDEBUG GR_DFLAGS = @gr_dflags@
GR_LIBS = @X_LIBS@ @X_PRE_LIBS@ @gr_libs@ @X_EXTRA_LIBS@ GR_LIBS = @X_LIBS@ @X_PRE_LIBS@ @gr_libs@ @X_EXTRA_LIBS@
GR_SRCS = @gr_srcs@ GR_SRCS = @gr_srcs@
GR_HELPER_SRCS = @gr_hsrcs@ GR_HELPER_SRCS = @gr_hsrcs@