From 97ed7bdd8dca714a455e2242f09080146bc59298 Mon Sep 17 00:00:00 2001 From: Tzafrir Cohen Date: Wed, 12 May 2010 20:06:11 +0300 Subject: [PATCH] Allow forcing CFLAGS and LDFLAGS for configure If we set a path for libpri: add it to CFLAGS and LDFLAGS at configure time. A workaround for https://issues.asterisk.org/view.php?id=17314 --- contrib/scripts/live_ast | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/contrib/scripts/live_ast b/contrib/scripts/live_ast index 1352762..0aba950 100755 --- a/contrib/scripts/live_ast +++ b/contrib/scripts/live_ast @@ -114,12 +114,17 @@ GDB_INIT="$BASE_DIR/gdbinit" LIVE_CONF="$BASE_DIR/live.conf" DISABLED_MODS="chan_h323 pbx_dundi" DISABLED_MODS_FILE="modules-disabled.conf" +LIVE_AST_CFLAGS="${CFLAGS:-}" +LIVE_AST_LDFLAGS="${LDFLAGS:-}" if [ -r "$LIVE_CONF" ]; then . "$LIVE_CONF"; fi if [ "$LIVE_AST_LIBPRI_PATH" != '' ]; then LIVE_AST_CONFIGURE_PARAMS="$LIVE_AST_CONFIGURE_PARAMS --with-pri=$LIVE_AST_LIBPRI_PATH" LIVE_AST_LD_PATH_EXTRA="$LIVE_AST_LD_PATH_EXTRA $LIVE_AST_LIBPRI_PATH" + # FIXME: https://issues.asterisk.org/view.php?id=17314 + LIVE_AST_CFLAGS="$LIVE_AST_CFLAGS -I$LIVE_AST_LIBPRI_PATH" + LIVE_AST_LDFLAGS="$LIVE_AST_LDFLAGS -L$LIVE_AST_LIBPRI_PATH" fi if [ "$LIVE_AST_ZAPTEL_PATH" != '' ]; then @@ -184,6 +189,7 @@ fi case "$command" in configure) + CFLAGS="$LIVE_AST_CFLAGS" LDFLAGS="$LIVE_AST_LDFLAGS" \ ./configure $LIVE_AST_CONFIGURE_PARAMS "$@" if [ "$LIVE_AST_FORCE_DEF_CONF" != '' ]; then rm -f menuselect.makeopts -- 1.5.6.5