File osmo-talloc3.diff of Package libosmocore
From d6c1607a724a07416c7d39f9b43f7af7349de666 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt <jengelh@inai.de> Date: Fri, 3 Oct 2014 12:14:17 +0200 Subject: [PATCH 2/2] build: default to system-provided talloc Rename the option --enable-talloc to --enable-internal-talloc, and then make disable-internal-talloc the default when nothing else is specified. --- configure.ac | 12 ++++++------ include/Makefile.am | 2 +- src/Makefile.am | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) Index: libosmocore/configure.ac =================================================================== --- libosmocore.orig/configure.ac +++ libosmocore/configure.ac @@ -94,14 +94,14 @@ if test "x$enable_pcsc" = "xyes" ; then fi AM_CONDITIONAL(ENABLE_PCSC, test "x$enable_pcsc" = "xyes") -AC_ARG_ENABLE(talloc, +AC_ARG_ENABLE([internal-talloc], [AS_HELP_STRING( - [--disable-talloc], + [--enable-internal-talloc], [Disable using bundled talloc memory allocator] )], - [enable_talloc=$enableval], [enable_talloc="yes"]) -AM_CONDITIONAL(ENABLE_TALLOC, [test x"$enable_talloc" = x"yes"]) -AS_IF([test x"$enable_talloc" = xno], + [internal_talloc=$enableval], [internal_talloc="no"]) +AM_CONDITIONAL([INTERNAL_TALLOC], [test x"$internal_talloc" = x"yes"]) +AS_IF([test x"$internal_talloc" = xno], [ PKG_CHECK_MODULES([TALLOC], [talloc]) OSMOCORE_INTERNAL_TALLOC=0 @@ -198,7 +198,7 @@ then AM_CONDITIONAL(ENABLE_MSGFILE, false) AM_CONDITIONAL(ENABLE_SERIAL, false) AM_CONDITIONAL(ENABLE_VTY, false) - AM_CONDITIONAL(ENABLE_TALLOC, false) + AM_CONDITIONAL([INTERNAL_TALLOC], [true]) AM_CONDITIONAL(ENABLE_UTILITIES, false) AM_CONDITIONAL(ENABLE_GB, false) AC_DEFINE([PANIC_INFLOOP],[1],[Use infinite loop on panic rather than fprintf/abort]) Index: libosmocore/include/Makefile.am =================================================================== --- libosmocore.orig/include/Makefile.am +++ libosmocore/include/Makefile.am @@ -93,7 +93,7 @@ nobase_include_HEADERS += osmocom/core/p endif nobase_nodist_include_HEADERS = osmocom/core/talloc.h -if ENABLE_TALLOC +if INTERNAL_TALLOC nobase_include_HEADERS += osmocom/core/talloc_int.h endif Index: libosmocore/src/Makefile.am =================================================================== --- libosmocore.orig/src/Makefile.am +++ libosmocore/src/Makefile.am @@ -27,7 +27,7 @@ else libosmocore_la_LDFLAGS = -version-info $(LIBVERSION) -no-undefined endif -if ENABLE_TALLOC +if INTERNAL_TALLOC libosmocore_la_SOURCES += talloc.c else libosmocore_la_LIBADD += $(TALLOC_LIBS)
