diff options
| author | Vincent Torri <vincent.torri@gmail.com> | 2012-07-01 13:34:52 +0000 |
|---|---|---|
| committer | Vincent Torri <vincent.torri@gmail.com> | 2012-07-01 13:34:52 +0000 |
| commit | 6964b15728810aae76f1148e8e17c76c95c661c1 (patch) | |
| tree | de2ff701bcd72e10e809a458eaa272979d9675e5 | |
| parent | d3036076b28f1796aa448af828d6d93bcf8533db (diff) | |
| download | eet-6964b15728810aae76f1148e8e17c76c95c661c1.tar.gz | |
Eet: fix CFLAGS value when --enable-assert is used
SVN revision: 73113
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | m4/efl_tests.m4 | 10 | ||||
| -rw-r--r-- | src/lib/Makefile.am | 6 |
3 files changed, 7 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index da34453..4f91427 100644 --- a/configure.ac +++ b/configure.ac @@ -487,9 +487,6 @@ EFL_CHECK_TESTS([eet], [enable_tests="yes"], [enable_tests="no"]) AC_SUBST([requirements_pc_eet]) AC_SUBST([requirements_libs_eet]) -DEBUG_CFLAGS="" -AC_SUBST([DEBUG_CFLAGS]) - AC_OUTPUT([ Makefile eet.pc diff --git a/m4/efl_tests.m4 b/m4/efl_tests.m4 index edd57f2..d8554e1 100644 --- a/m4/efl_tests.m4 +++ b/m4/efl_tests.m4 @@ -44,17 +44,17 @@ if test "x${_efl_enable_tests}" = "xyes" ; then m4_defn([UPEFL])[]_CFLAGS="${m4_defn([UPEFL])[]_CFLAGS} -fprofile-arcs -ftest-coverage" m4_defn([UPEFL])[]_LIBS="${m4_defn([UPEFL])[]_LIBS} -lgcov" # remove any optimisation flag and force debug symbols - m4_defn([UPEFL])[]_CFLAGS="${m4_defn([UPEFL])[]_CFLAGS} -g -O0 -DDEBUG" + if test "x${prefer_assert}" = "xno"; then + m4_defn([UPEFL])[]_CFLAGS="${m4_defn([UPEFL])[]_CFLAGS} -DNDEBUG" + else + m4_defn([UPEFL])[]_CFLAGS="${m4_defn([UPEFL])[]_CFLAGS} -g -O0 -DDEBUG" + fi efl_enable_coverage="yes" else AC_MSG_WARN([lcov is not found, disable profiling instrumentation]) fi fi -dnl Substitution -AC_SUBST(EFL_COVERAGE_CFLAGS) -AC_SUBST(EFL_COVERAGE_LIBS) - AM_CONDITIONAL(EFL_ENABLE_TESTS, test "x${_efl_enable_tests}" = "xyes") AS_IF([test "x$_efl_enable_tests" = "xyes"], [$2], [$3]) diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 71a233f..38096e7 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -10,8 +10,7 @@ AM_CPPFLAGS = \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ @EET_CFLAGS@ \ -@EFL_EET_BUILD@ \ -@EFL_COVERAGE_CFLAGS@ +@EFL_EET_BUILD@ includes_HEADERS = Eet.h includesdir = $(includedir)/eet-@VMAJ@ @@ -34,8 +33,7 @@ lz4/lz4.h \ lz4/lz4hc.c \ lz4/lz4hc.h -libeet_la_CFLAGS = @DEBUG_CFLAGS@ -libeet_la_LIBADD = @EFL_COVERAGE_LIBS@ @EET_LIBS@ -lm +libeet_la_LIBADD = @EET_LIBS@ -lm libeet_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ EXTRA_DIST = lz4/README |