Permalink
Browse files

- fix libefence and libdmalloc configure/detection

- workaround libdmalloc Debian bug #633945
- always enable compile-time warnings
  • Loading branch information...
1 parent a4887a6 commit c37e61a394c15367c3a0a6eddc313a3f44b87066 @dkorunic committed Jan 11, 2013
Showing with 115 additions and 210 deletions.
  1. +14 −38 autom4te.cache/output.0
  2. +14 −38 autom4te.cache/output.1
  3. +47 −55 autom4te.cache/traces.0
  4. +12 −14 autom4te.cache/traces.1
  5. +14 −38 configure
  6. +14 −21 configure.in
  7. +0 −6 include/defs.h.in
View
52 autom4te.cache/output.0
@@ -689,7 +689,6 @@ with_nicklen
with_channellen
with_topiclen
with_network
-enable_warnings
enable_asserts
enable_gimmecore
enable_daemontools
@@ -1323,7 +1322,6 @@ Optional Features:
--enable-efence Enable Electric Fence support [default=no]
--enable-dmalloc Enable dmalloc support [default=no]
--enable-boehm-gc Enable Boehm GC support [default=yes]
- --enable-warnings Enable compiler warnings [default=no]
--enable-asserts Enable asserts in code [default=no]
--enable-gimmecore Enable core dumping [default=yes]
--enable-daemontools Enable daemontools support [default=no]
@@ -6158,12 +6156,9 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_efence_malloc" >&5
$as_echo "$ac_cv_lib_efence_malloc" >&6; }
if test "x$ac_cv_lib_efence_malloc" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_LIBEFENCE 1
-_ACEOF
-
- LIBS="-lefence $LIBS"
-
+ LIBS="$LIBS -lefence"
+else
+ cf_enable_efence="no"
fi
else
@@ -6175,12 +6170,12 @@ fi
$as_echo_n "checking compile with malloc debugging libs... " >&6; }
@%:@ Check whether --enable-dmalloc was given.
if test "${enable_dmalloc+set}" = set; then :
- enableval=$enable_dmalloc; cf_enable_malloc=$enableval
+ enableval=$enable_dmalloc; cf_enable_dmalloc=$enableval
else
- cf_enable_malloc="no"
+ cf_enable_dmalloc="no"
fi
-if test "x$cf_enable_malloc" = "xyes"; then
+if test "x$cf_enable_dmalloc" = "xyes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for malloc in -ldmalloc" >&5
@@ -6220,12 +6215,10 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dmalloc_malloc" >&5
$as_echo "$ac_cv_lib_dmalloc_malloc" >&6; }
if test "x$ac_cv_lib_dmalloc_malloc" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_LIBDMALLOC 1
-_ACEOF
-
- LIBS="-ldmalloc $LIBS"
-
+ CFLAGS="$CFLAGS -U_GNU_SOURCE"
+ LIBS="$LIBS -ldmalloc"
+else
+ cf_enable_dmalloc="no"
fi
else
@@ -6393,24 +6386,6 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking compile with warning flags" >&5
-$as_echo_n "checking compile with warning flags... " >&6; }
-@%:@ Check whether --enable-warnings was given.
-if test "${enable_warnings+set}" = set; then :
- enableval=$enable_warnings; cf_enable_warnings=$enableval
-else
- cf_enable_warnings="no"
-fi
-
-if test "x$cf_enable_warnings" = "xyes"; then
- CFLAGS="$CFLAGS -Wall"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking compile with asserts enabled" >&5
$as_echo_n "checking compile with asserts enabled... " >&6; }
@%:@ Check whether --enable-asserts was given.
@@ -7784,7 +7759,7 @@ echo "
Configuration:
C Compiler ........... ${CC}
C Compiler flags...... ${CFLAGS}
- Linker flags ......... ${LDFLAGS}
+ Linker flags ......... ${LIBS} ${LDFLAGS}
Source revision ...... ${ac_cv_revision}
Package revision ..... ${ac_cv_version}
Detected OS .......... ${host_os}
@@ -7797,11 +7772,12 @@ Compile configuration:
Topic length ......... ${ac_cv_topiclen}
Extra configuration:
- Warnings enabled ..... ${cf_enable_warnings}
+ LibEfence enabled .... ${cf_enable_efence}
+ Dmalloc enabled ...... ${cf_enable_dmalloc}
+ Boehm GC enabled ..... ${cf_enable_boehm_gc}
Asserts enabled ...... ${cf_enable_asserts}
Coredumps enabled .... ${cf_enable_gimmecore}
Daemontools enabled .. ${cf_enable_daemontools}
- Boehm GC enabled ..... ${cf_enable_boehm_gc}
NOTE: Please edit include/config.h to change the settings
to match your network before running make!"
View
52 autom4te.cache/output.1
@@ -689,7 +689,6 @@ with_nicklen
with_channellen
with_topiclen
with_network
-enable_warnings
enable_asserts
enable_gimmecore
enable_daemontools
@@ -1323,7 +1322,6 @@ Optional Features:
--enable-efence Enable Electric Fence support [default=no]
--enable-dmalloc Enable dmalloc support [default=no]
--enable-boehm-gc Enable Boehm GC support [default=yes]
- --enable-warnings Enable compiler warnings [default=no]
--enable-asserts Enable asserts in code [default=no]
--enable-gimmecore Enable core dumping [default=yes]
--enable-daemontools Enable daemontools support [default=no]
@@ -6171,12 +6169,9 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_efence_malloc" >&5
$as_echo "$ac_cv_lib_efence_malloc" >&6; }
if test "x$ac_cv_lib_efence_malloc" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_LIBEFENCE 1
-_ACEOF
-
- LIBS="-lefence $LIBS"
-
+ LIBS="$LIBS -lefence"
+else
+ cf_enable_efence="no"
fi
else
@@ -6188,12 +6183,12 @@ fi
$as_echo_n "checking compile with malloc debugging libs... " >&6; }
@%:@ Check whether --enable-dmalloc was given.
if test "${enable_dmalloc+set}" = set; then :
- enableval=$enable_dmalloc; cf_enable_malloc=$enableval
+ enableval=$enable_dmalloc; cf_enable_dmalloc=$enableval
else
- cf_enable_malloc="no"
+ cf_enable_dmalloc="no"
fi
-if test "x$cf_enable_malloc" = "xyes"; then
+if test "x$cf_enable_dmalloc" = "xyes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for malloc in -ldmalloc" >&5
@@ -6233,12 +6228,10 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dmalloc_malloc" >&5
$as_echo "$ac_cv_lib_dmalloc_malloc" >&6; }
if test "x$ac_cv_lib_dmalloc_malloc" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_LIBDMALLOC 1
-_ACEOF
-
- LIBS="-ldmalloc $LIBS"
-
+ CFLAGS="$CFLAGS -U_GNU_SOURCE"
+ LIBS="$LIBS -ldmalloc"
+else
+ cf_enable_dmalloc="no"
fi
else
@@ -6406,24 +6399,6 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking compile with warning flags" >&5
-$as_echo_n "checking compile with warning flags... " >&6; }
-@%:@ Check whether --enable-warnings was given.
-if test "${enable_warnings+set}" = set; then :
- enableval=$enable_warnings; cf_enable_warnings=$enableval
-else
- cf_enable_warnings="no"
-fi
-
-if test "x$cf_enable_warnings" = "xyes"; then
- CFLAGS="$CFLAGS -Wall"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking compile with asserts enabled" >&5
$as_echo_n "checking compile with asserts enabled... " >&6; }
@%:@ Check whether --enable-asserts was given.
@@ -7797,7 +7772,7 @@ echo "
Configuration:
C Compiler ........... ${CC}
C Compiler flags...... ${CFLAGS}
- Linker flags ......... ${LDFLAGS}
+ Linker flags ......... ${LIBS} ${LDFLAGS}
Source revision ...... ${ac_cv_revision}
Package revision ..... ${ac_cv_version}
Detected OS .......... ${host_os}
@@ -7810,11 +7785,12 @@ Compile configuration:
Topic length ......... ${ac_cv_topiclen}
Extra configuration:
- Warnings enabled ..... ${cf_enable_warnings}
+ LibEfence enabled .... ${cf_enable_efence}
+ Dmalloc enabled ...... ${cf_enable_dmalloc}
+ Boehm GC enabled ..... ${cf_enable_boehm_gc}
Asserts enabled ...... ${cf_enable_asserts}
Coredumps enabled .... ${cf_enable_gimmecore}
Daemontools enabled .. ${cf_enable_daemontools}
- Boehm GC enabled ..... ${cf_enable_boehm_gc}
NOTE: Please edit include/config.h to change the settings
to match your network before running make!"
View
102 autom4te.cache/traces.0
@@ -584,71 +584,63 @@ m4trace:configure.in:323: -1- AC_DEFINE_TRACE_LITERAL([HAVE_SYS_NERR])
m4trace:configure.in:323: -1- m4_pattern_allow([^HAVE_SYS_NERR$])
m4trace:configure.in:323: -1- AH_OUTPUT([HAVE_SYS_NERR], [/* Define to 1 if you have sys_nerr */
@%:@undef HAVE_SYS_NERR])
-m4trace:configure.in:341: -1- AH_OUTPUT([HAVE_LIBEFENCE], [/* Define to 1 if you have the `efence\' library (-lefence). */
-@%:@undef HAVE_LIBEFENCE])
-m4trace:configure.in:341: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBEFENCE])
-m4trace:configure.in:341: -1- m4_pattern_allow([^HAVE_LIBEFENCE$])
-m4trace:configure.in:354: -1- AH_OUTPUT([HAVE_LIBDMALLOC], [/* Define to 1 if you have the `dmalloc\' library (-ldmalloc). */
-@%:@undef HAVE_LIBDMALLOC])
-m4trace:configure.in:354: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBDMALLOC])
-m4trace:configure.in:354: -1- m4_pattern_allow([^HAVE_LIBDMALLOC$])
-m4trace:configure.in:367: -1- AH_OUTPUT([HAVE_GC_GC_H], [/* Define to 1 if you have the <gc/gc.h> header file. */
+m4trace:configure.in:372: -1- AH_OUTPUT([HAVE_GC_GC_H], [/* Define to 1 if you have the <gc/gc.h> header file. */
@%:@undef HAVE_GC_GC_H])
-m4trace:configure.in:367: -1- AH_OUTPUT([HAVE_GC_H], [/* Define to 1 if you have the <gc.h> header file. */
+m4trace:configure.in:372: -1- AH_OUTPUT([HAVE_GC_H], [/* Define to 1 if you have the <gc.h> header file. */
@%:@undef HAVE_GC_H])
-m4trace:configure.in:367: -1- AC_DEFINE_TRACE_LITERAL([HAVE_BOEHM_GC])
-m4trace:configure.in:367: -1- m4_pattern_allow([^HAVE_BOEHM_GC$])
-m4trace:configure.in:367: -1- AH_OUTPUT([HAVE_BOEHM_GC], [/* Define this to enable Boehm GC */
+m4trace:configure.in:372: -1- AC_DEFINE_TRACE_LITERAL([HAVE_BOEHM_GC])
+m4trace:configure.in:372: -1- m4_pattern_allow([^HAVE_BOEHM_GC$])
+m4trace:configure.in:372: -1- AH_OUTPUT([HAVE_BOEHM_GC], [/* Define this to enable Boehm GC */
@%:@undef HAVE_BOEHM_GC])
-m4trace:configure.in:423: -1- AC_DEFINE_TRACE_LITERAL([NICKLEN])
-m4trace:configure.in:423: -1- m4_pattern_allow([^NICKLEN$])
-m4trace:configure.in:423: -1- AH_OUTPUT([NICKLEN], [/* Define to nick length */
+m4trace:configure.in:428: -1- AC_DEFINE_TRACE_LITERAL([NICKLEN])
+m4trace:configure.in:428: -1- m4_pattern_allow([^NICKLEN$])
+m4trace:configure.in:428: -1- AH_OUTPUT([NICKLEN], [/* Define to nick length */
@%:@undef NICKLEN])
-m4trace:configure.in:424: -1- AC_DEFINE_TRACE_LITERAL([CHANNELLEN])
-m4trace:configure.in:424: -1- m4_pattern_allow([^CHANNELLEN$])
-m4trace:configure.in:424: -1- AH_OUTPUT([CHANNELLEN], [/* Define to channel length */
+m4trace:configure.in:429: -1- AC_DEFINE_TRACE_LITERAL([CHANNELLEN])
+m4trace:configure.in:429: -1- m4_pattern_allow([^CHANNELLEN$])
+m4trace:configure.in:429: -1- AH_OUTPUT([CHANNELLEN], [/* Define to channel length */
@%:@undef CHANNELLEN])
-m4trace:configure.in:425: -1- AC_DEFINE_TRACE_LITERAL([TOPICLEN])
-m4trace:configure.in:425: -1- m4_pattern_allow([^TOPICLEN$])
-m4trace:configure.in:425: -1- AH_OUTPUT([TOPICLEN], [/* Define to topic length */
+m4trace:configure.in:430: -1- AC_DEFINE_TRACE_LITERAL([TOPICLEN])
+m4trace:configure.in:430: -1- m4_pattern_allow([^TOPICLEN$])
+m4trace:configure.in:430: -1- AH_OUTPUT([TOPICLEN], [/* Define to topic length */
@%:@undef TOPICLEN])
-m4trace:configure.in:448: -1- AC_DEFINE_TRACE_LITERAL([NDEBUG])
-m4trace:configure.in:448: -1- m4_pattern_allow([^NDEBUG$])
-m4trace:configure.in:448: -1- AH_OUTPUT([NDEBUG], [/* Define this to disable debugging support */
+m4trace:configure.in:440: -1- AC_DEFINE_TRACE_LITERAL([NDEBUG])
+m4trace:configure.in:440: -1- m4_pattern_allow([^NDEBUG$])
+m4trace:configure.in:440: -1- AH_OUTPUT([NDEBUG], [/* Define this to disable debugging support */
@%:@undef NDEBUG])
-m4trace:configure.in:451: -1- AC_DEFINE_TRACE_LITERAL([SOFT_ASSERT])
-m4trace:configure.in:451: -1- m4_pattern_allow([^SOFT_ASSERT$])
-m4trace:configure.in:451: -1- AH_OUTPUT([SOFT_ASSERT], [/* Define this to enable soft asserts */
+m4trace:configure.in:443: -1- AC_DEFINE_TRACE_LITERAL([SOFT_ASSERT])
+m4trace:configure.in:443: -1- m4_pattern_allow([^SOFT_ASSERT$])
+m4trace:configure.in:443: -1- AH_OUTPUT([SOFT_ASSERT], [/* Define this to enable soft asserts */
@%:@undef SOFT_ASSERT])
-m4trace:configure.in:452: -1- AC_DEFINE_TRACE_LITERAL([NDEBUG])
-m4trace:configure.in:452: -1- m4_pattern_allow([^NDEBUG$])
-m4trace:configure.in:452: -1- AH_OUTPUT([NDEBUG], [/* Define this to disable debugging support */
+m4trace:configure.in:444: -1- AC_DEFINE_TRACE_LITERAL([NDEBUG])
+m4trace:configure.in:444: -1- m4_pattern_allow([^NDEBUG$])
+m4trace:configure.in:444: -1- AH_OUTPUT([NDEBUG], [/* Define this to disable debugging support */
@%:@undef NDEBUG])
-m4trace:configure.in:467: -1- AC_DEFINE_TRACE_LITERAL([GIMMECORE])
-m4trace:configure.in:467: -1- m4_pattern_allow([^GIMMECORE$])
-m4trace:configure.in:467: -1- AH_OUTPUT([GIMMECORE], [/* Define this to enable core dumping */
+m4trace:configure.in:459: -1- AC_DEFINE_TRACE_LITERAL([GIMMECORE])
+m4trace:configure.in:459: -1- m4_pattern_allow([^GIMMECORE$])
+m4trace:configure.in:459: -1- AH_OUTPUT([GIMMECORE], [/* Define this to enable core dumping */
@%:@undef GIMMECORE])
-m4trace:configure.in:478: -1- AC_DEFINE_TRACE_LITERAL([DAEMONTOOLS])
-m4trace:configure.in:478: -1- m4_pattern_allow([^DAEMONTOOLS$])
-m4trace:configure.in:478: -1- AH_OUTPUT([DAEMONTOOLS], [/* Define this to enable daemontools support */
+m4trace:configure.in:470: -1- AC_DEFINE_TRACE_LITERAL([DAEMONTOOLS])
+m4trace:configure.in:470: -1- m4_pattern_allow([^DAEMONTOOLS$])
+m4trace:configure.in:470: -1- AH_OUTPUT([DAEMONTOOLS], [/* Define this to enable daemontools support */
@%:@undef DAEMONTOOLS])
-m4trace:configure.in:483: -1- AC_CONFIG_FILES([Makefile compat/Makefile src/Makefile tools/Makefile \
+m4trace:configure.in:475: -1- AC_CONFIG_FILES([Makefile compat/Makefile src/Makefile tools/Makefile \
bin/settings.conf bin/cleandb include/config.h])
-m4trace:configure.in:483: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
+m4trace:configure.in:475: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
You should run autoupdate.], [])
-m4trace:configure.in:483: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
-m4trace:configure.in:483: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
-m4trace:configure.in:483: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.in:483: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
-m4trace:configure.in:483: -1- AC_SUBST_TRACE([LTLIBOBJS])
-m4trace:configure.in:483: -1- m4_pattern_allow([^LTLIBOBJS$])
-m4trace:configure.in:483: -1- AC_SUBST_TRACE([top_builddir])
-m4trace:configure.in:483: -1- AC_SUBST_TRACE([top_build_prefix])
-m4trace:configure.in:483: -1- AC_SUBST_TRACE([srcdir])
-m4trace:configure.in:483: -1- AC_SUBST_TRACE([abs_srcdir])
-m4trace:configure.in:483: -1- AC_SUBST_TRACE([top_srcdir])
-m4trace:configure.in:483: -1- AC_SUBST_TRACE([abs_top_srcdir])
-m4trace:configure.in:483: -1- AC_SUBST_TRACE([builddir])
-m4trace:configure.in:483: -1- AC_SUBST_TRACE([abs_builddir])
-m4trace:configure.in:483: -1- AC_SUBST_TRACE([abs_top_builddir])
-m4trace:configure.in:483: -1- AC_SUBST_TRACE([INSTALL])
+m4trace:configure.in:475: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
+m4trace:configure.in:475: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
+m4trace:configure.in:475: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.in:475: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
+m4trace:configure.in:475: -1- AC_SUBST_TRACE([LTLIBOBJS])
+m4trace:configure.in:475: -1- m4_pattern_allow([^LTLIBOBJS$])
+m4trace:configure.in:475: -1- AC_SUBST_TRACE([top_builddir])
+m4trace:configure.in:475: -1- AC_SUBST_TRACE([top_build_prefix])
+m4trace:configure.in:475: -1- AC_SUBST_TRACE([srcdir])
+m4trace:configure.in:475: -1- AC_SUBST_TRACE([abs_srcdir])
+m4trace:configure.in:475: -1- AC_SUBST_TRACE([top_srcdir])
+m4trace:configure.in:475: -1- AC_SUBST_TRACE([abs_top_srcdir])
+m4trace:configure.in:475: -1- AC_SUBST_TRACE([builddir])
+m4trace:configure.in:475: -1- AC_SUBST_TRACE([abs_builddir])
+m4trace:configure.in:475: -1- AC_SUBST_TRACE([abs_top_builddir])
+m4trace:configure.in:475: -1- AC_SUBST_TRACE([INSTALL])
View
26 autom4te.cache/traces.1
@@ -156,18 +156,16 @@ configure.in:294: the top level])
m4trace:configure.in:294: -1- m4_pattern_allow([^HAVE_BROKEN_INT_GETADDRINFO$])
m4trace:configure.in:310: -1- m4_pattern_allow([^HAVE_SYS_ERRLIST$])
m4trace:configure.in:323: -1- m4_pattern_allow([^HAVE_SYS_NERR$])
-m4trace:configure.in:341: -1- m4_pattern_allow([^HAVE_LIBEFENCE$])
-m4trace:configure.in:354: -1- m4_pattern_allow([^HAVE_LIBDMALLOC$])
-m4trace:configure.in:367: -1- m4_pattern_allow([^HAVE_BOEHM_GC$])
-m4trace:configure.in:423: -1- m4_pattern_allow([^NICKLEN$])
-m4trace:configure.in:424: -1- m4_pattern_allow([^CHANNELLEN$])
-m4trace:configure.in:425: -1- m4_pattern_allow([^TOPICLEN$])
-m4trace:configure.in:448: -1- m4_pattern_allow([^NDEBUG$])
-m4trace:configure.in:451: -1- m4_pattern_allow([^SOFT_ASSERT$])
-m4trace:configure.in:452: -1- m4_pattern_allow([^NDEBUG$])
-m4trace:configure.in:467: -1- m4_pattern_allow([^GIMMECORE$])
-m4trace:configure.in:478: -1- m4_pattern_allow([^DAEMONTOOLS$])
-m4trace:configure.in:483: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
+m4trace:configure.in:372: -1- m4_pattern_allow([^HAVE_BOEHM_GC$])
+m4trace:configure.in:428: -1- m4_pattern_allow([^NICKLEN$])
+m4trace:configure.in:429: -1- m4_pattern_allow([^CHANNELLEN$])
+m4trace:configure.in:430: -1- m4_pattern_allow([^TOPICLEN$])
+m4trace:configure.in:440: -1- m4_pattern_allow([^NDEBUG$])
+m4trace:configure.in:443: -1- m4_pattern_allow([^SOFT_ASSERT$])
+m4trace:configure.in:444: -1- m4_pattern_allow([^NDEBUG$])
+m4trace:configure.in:459: -1- m4_pattern_allow([^GIMMECORE$])
+m4trace:configure.in:470: -1- m4_pattern_allow([^DAEMONTOOLS$])
+m4trace:configure.in:475: -1- _m4_warn([obsolete], [AC_OUTPUT should be used without arguments.
You should run autoupdate.], [])
-m4trace:configure.in:483: -1- m4_pattern_allow([^LIB@&t@OBJS$])
-m4trace:configure.in:483: -1- m4_pattern_allow([^LTLIBOBJS$])
+m4trace:configure.in:475: -1- m4_pattern_allow([^LIB@&t@OBJS$])
+m4trace:configure.in:475: -1- m4_pattern_allow([^LTLIBOBJS$])
View
52 configure
@@ -689,7 +689,6 @@ with_nicklen
with_channellen
with_topiclen
with_network
-enable_warnings
enable_asserts
enable_gimmecore
enable_daemontools
@@ -1323,7 +1322,6 @@ Optional Features:
--enable-efence Enable Electric Fence support [default=no]
--enable-dmalloc Enable dmalloc support [default=no]
--enable-boehm-gc Enable Boehm GC support [default=yes]
- --enable-warnings Enable compiler warnings [default=no]
--enable-asserts Enable asserts in code [default=no]
--enable-gimmecore Enable core dumping [default=yes]
--enable-daemontools Enable daemontools support [default=no]
@@ -6158,12 +6156,9 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_efence_malloc" >&5
$as_echo "$ac_cv_lib_efence_malloc" >&6; }
if test "x$ac_cv_lib_efence_malloc" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBEFENCE 1
-_ACEOF
-
- LIBS="-lefence $LIBS"
-
+ LIBS="$LIBS -lefence"
+else
+ cf_enable_efence="no"
fi
else
@@ -6175,12 +6170,12 @@ fi
$as_echo_n "checking compile with malloc debugging libs... " >&6; }
# Check whether --enable-dmalloc was given.
if test "${enable_dmalloc+set}" = set; then :
- enableval=$enable_dmalloc; cf_enable_malloc=$enableval
+ enableval=$enable_dmalloc; cf_enable_dmalloc=$enableval
else
- cf_enable_malloc="no"
+ cf_enable_dmalloc="no"
fi
-if test "x$cf_enable_malloc" = "xyes"; then
+if test "x$cf_enable_dmalloc" = "xyes"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for malloc in -ldmalloc" >&5
@@ -6220,12 +6215,10 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dmalloc_malloc" >&5
$as_echo "$ac_cv_lib_dmalloc_malloc" >&6; }
if test "x$ac_cv_lib_dmalloc_malloc" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBDMALLOC 1
-_ACEOF
-
- LIBS="-ldmalloc $LIBS"
-
+ CFLAGS="$CFLAGS -U_GNU_SOURCE"
+ LIBS="$LIBS -ldmalloc"
+else
+ cf_enable_dmalloc="no"
fi
else
@@ -6393,24 +6386,6 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking compile with warning flags" >&5
-$as_echo_n "checking compile with warning flags... " >&6; }
-# Check whether --enable-warnings was given.
-if test "${enable_warnings+set}" = set; then :
- enableval=$enable_warnings; cf_enable_warnings=$enableval
-else
- cf_enable_warnings="no"
-fi
-
-if test "x$cf_enable_warnings" = "xyes"; then
- CFLAGS="$CFLAGS -Wall"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking compile with asserts enabled" >&5
$as_echo_n "checking compile with asserts enabled... " >&6; }
# Check whether --enable-asserts was given.
@@ -7784,7 +7759,7 @@ echo "
Configuration:
C Compiler ........... ${CC}
C Compiler flags...... ${CFLAGS}
- Linker flags ......... ${LDFLAGS}
+ Linker flags ......... ${LIBS} ${LDFLAGS}
Source revision ...... ${ac_cv_revision}
Package revision ..... ${ac_cv_version}
Detected OS .......... ${host_os}
@@ -7797,11 +7772,12 @@ Compile configuration:
Topic length ......... ${ac_cv_topiclen}
Extra configuration:
- Warnings enabled ..... ${cf_enable_warnings}
+ LibEfence enabled .... ${cf_enable_efence}
+ Dmalloc enabled ...... ${cf_enable_dmalloc}
+ Boehm GC enabled ..... ${cf_enable_boehm_gc}
Asserts enabled ...... ${cf_enable_asserts}
Coredumps enabled .... ${cf_enable_gimmecore}
Daemontools enabled .. ${cf_enable_daemontools}
- Boehm GC enabled ..... ${cf_enable_boehm_gc}
NOTE: Please edit include/config.h to change the settings
to match your network before running make!"
View
35 configure.in
@@ -338,7 +338,9 @@ AC_ARG_ENABLE(efence,
[cf_enable_efence="no"])
if test "x$cf_enable_efence" = "xyes"; then
AC_MSG_RESULT(yes)
- AC_CHECK_LIB(efence, malloc)
+ AC_CHECK_LIB(efence, malloc,
+ [LIBS="$LIBS -lefence"],
+ [cf_enable_efence="no"])
else
AC_MSG_RESULT(no)
fi
@@ -347,11 +349,14 @@ dnl Try dmalloc support
AC_MSG_CHECKING([compile with malloc debugging libs])
AC_ARG_ENABLE(dmalloc,
[ --enable-dmalloc Enable dmalloc support [[default=no]]],
- [cf_enable_malloc=$enableval],
- [cf_enable_malloc="no"])
-if test "x$cf_enable_malloc" = "xyes"; then
+ [cf_enable_dmalloc=$enableval],
+ [cf_enable_dmalloc="no"])
+if test "x$cf_enable_dmalloc" = "xyes"; then
AC_MSG_RESULT(yes)
- AC_CHECK_LIB(dmalloc, malloc)
+ AC_CHECK_LIB(dmalloc, malloc,
+ [CFLAGS="$CFLAGS -U_GNU_SOURCE"
+ LIBS="$LIBS -ldmalloc"],
+ [cf_enable_dmalloc="no"])
else
AC_MSG_RESULT(no)
fi
@@ -424,19 +429,6 @@ AC_DEFINE_UNQUOTED(NICKLEN, $ac_cv_nicklen, [Define to nick length])
AC_DEFINE_UNQUOTED(CHANNELLEN, $ac_cv_channellen, [Define to channel length])
AC_DEFINE_UNQUOTED(TOPICLEN, $ac_cv_topiclen, [Define to topic length])
-dnl Check if warnings are to be enabled
-AC_MSG_CHECKING([compile with warning flags])
-AC_ARG_ENABLE(warnings,
- [ --enable-warnings Enable compiler warnings [[default=no]]],
- [cf_enable_warnings=$enableval],
- [cf_enable_warnings="no"])
-if test "x$cf_enable_warnings" = "xyes"; then
- CFLAGS="$CFLAGS -Wall"
- AC_MSG_RESULT(yes)
-else
- AC_MSG_RESULT(no)
-fi
-
dnl Check if asserts are to be enabled
AC_MSG_CHECKING([compile with asserts enabled])
AC_ARG_ENABLE(asserts,
@@ -487,7 +479,7 @@ echo "
Configuration:
C Compiler ........... ${CC}
C Compiler flags...... ${CFLAGS}
- Linker flags ......... ${LDFLAGS}
+ Linker flags ......... ${LIBS} ${LDFLAGS}
Source revision ...... ${ac_cv_revision}
Package revision ..... ${ac_cv_version}
Detected OS .......... ${host_os}
@@ -500,11 +492,12 @@ Compile configuration:
Topic length ......... ${ac_cv_topiclen}
Extra configuration:
- Warnings enabled ..... ${cf_enable_warnings}
+ LibEfence enabled .... ${cf_enable_efence}
+ Dmalloc enabled ...... ${cf_enable_dmalloc}
+ Boehm GC enabled ..... ${cf_enable_boehm_gc}
Asserts enabled ...... ${cf_enable_asserts}
Coredumps enabled .... ${cf_enable_gimmecore}
Daemontools enabled .. ${cf_enable_daemontools}
- Boehm GC enabled ..... ${cf_enable_boehm_gc}
NOTE: Please edit include/config.h to change the settings
to match your network before running make!"
View
6 include/defs.h.in
@@ -64,12 +64,6 @@
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
-/* Define to 1 if you have the `dmalloc' library (-ldmalloc). */
-#undef HAVE_LIBDMALLOC
-
-/* Define to 1 if you have the `efence' library (-lefence). */
-#undef HAVE_LIBEFENCE
-
/* Define to 1 if you have the <limits.h> header file. */
#undef HAVE_LIMITS_H

0 comments on commit c37e61a

Please sign in to comment.