From fca47616535d31d7cd321d86e08da32cdb9108dd Mon Sep 17 00:00:00 2001
From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <rem@videolan.org>
Date: Sat, 21 Oct 2006 20:05:02 +0000
Subject: [PATCH] Attempt to fix my previous commit

---
 configure.ac | 4 +++-
 m4/flags.m4  | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4d3fc00311..c1854c33ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -893,7 +893,9 @@ RDC_PROG_CC_FLAGS_IFELSE([-pipe])
 
 dnl This helps detect broken plugins with undefined symbols
 dnl Better fail loudly at build-time than silenty at run-time.
-RDC_PROG_LINK_FLAGS_IFELSE([-Wl,-z,defs])
+RDC_PROG_LINK_FLAGS_IFELSE([-Wl,-z,defs], [
+  VLC_ADD_LDFLAGS([plugin],[-Wl,-z,defs])
+])
 
 dnl Check for various optimization flags
 AC_CACHE_CHECK([if \$CC accepts -Os],
diff --git a/m4/flags.m4 b/m4/flags.m4
index 84222ad432..57f22233f2 100644
--- a/m4/flags.m4
+++ b/m4/flags.m4
@@ -13,7 +13,7 @@ AC_DEFUN([RDC_PROG_CC_FLAGS_IFELSE],
   CFLAGS_save="${CFLAGS}"
   as_ac_var=`echo "ac_cv_prog_cc_flags_$1" | $as_tr_sh`
   AC_CACHE_CHECK([if $CC accepts $1], [$as_ac_var], [
-    CFLAGS="${CFLAGS_save} $1"
+    CFLAGS="${CFLAGS} $1"
     AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], [
       eval "$as_ac_var=yes"
     ],[
@@ -44,7 +44,7 @@ AC_DEFUN([RDC_PROG_LINK_FLAGS_IFELSE],
   LDFLAGS_save="${LDFLAGS}"
   as_ac_var=`echo "ac_cv_prog_link_flags_$1" | $as_tr_sh`
   AC_CACHE_CHECK([if $LINK accepts $1], [$as_ac_var], [
-    LDFLAGS="${LDFLAGS_save} $1"
+    LDFLAGS="${LDFLAGS} $1"
     AC_LINK_IFELSE([AC_LANG_PROGRAM()], [
       eval "$as_ac_var=yes"
     ],[
-- 
2.39.5