From: Brian West <brian@freeswitch.org>
Date: Wed, 12 Mar 2014 20:22:56 +0000 (-0500)
Subject: fix automake warnings for var redefined
X-Git-Tag: v1.5.11~73
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b935e103729f337a222ee66d8b17b53c572bb4e;p=thirdparty%2Ffreeswitch.git

fix automake warnings for var redefined
---

diff --git a/src/mod/directories/mod_ldap/Makefile.am b/src/mod/directories/mod_ldap/Makefile.am
index 399cac5c9c..7705f37d35 100644
--- a/src/mod/directories/mod_ldap/Makefile.am
+++ b/src/mod/directories/mod_ldap/Makefile.am
@@ -12,7 +12,7 @@ mod_ldap_la_CFLAGS   = $(AM_CFLAGS) -DWITH_OPENLDAP -DLDAP_DEPRECATED -I$(LDAP_D
 mod_ldap_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(LDAPLA) $(LIBLBERLA)
 mod_ldap_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
 
-DEFAULT_ARGS= --disable-slapd --disable-bdb --disable-hdb
+MY_DEFAULT_ARGS= --disable-slapd --disable-bdb --disable-hdb
 
 $(MODNAME).lo: $(LDAPLA) $(LIBLBERLA)
 
@@ -21,7 +21,7 @@ $(LDAP_DIR):
 
 $(LDAP_BUILDDIR)/Makefile: $(LDAP_DIR)
 	mkdir -p $(LDAP_BUILDDIR)
-	cd $(LDAP_BUILDDIR) && $(DEFAULT_VARS) $(LDAP_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(LDAP_DIR)
+	cd $(LDAP_BUILDDIR) && $(MY_DEFAULT_VARS) $(LDAP_DIR)/configure $(MY_DEFAULT_ARGS) --srcdir=$(LDAP_DIR)
 	$(TOUCH_TARGET)
 
 $(LDAPLA) $(LIBLBERLA): $(LDAP_BUILDDIR)/Makefile
diff --git a/src/mod/xml_int/mod_xml_ldap/Makefile.am b/src/mod/xml_int/mod_xml_ldap/Makefile.am
index 329d0f3a95..7b1348046e 100644
--- a/src/mod/xml_int/mod_xml_ldap/Makefile.am
+++ b/src/mod/xml_int/mod_xml_ldap/Makefile.am
@@ -17,14 +17,14 @@ mod_xml_ldap_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
 
 BUILT_SOURCES=$(LDAPLA) $(LIBLBERLA) $(LIBLUTILA)
 
-DEFAULT_ARGS= --disable-slapd --disable-slurpd --disable-relay --disable-bdb --disable-hdb
+MY_DEFAULT_ARGS= --disable-slapd --disable-slurpd --disable-relay --disable-bdb --disable-hdb
 
 $(LDAP_DIR):
 	$(GETLIB) $(LDAP).tar.gz
 
 $(LDAP_BUILDDIR)/Makefile: $(LDAP_DIR)
 	mkdir -p $(LDAP_BUILDDIR)
-	cd $(LDAP_BUILDDIR) && $(DEFAULT_VARS) $(LDAP_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(LDAP_DIR)
+	cd $(LDAP_BUILDDIR) && $(MY_DEFAULT_VARS) $(LDAP_DIR)/configure $(MY_DEFAULT_ARGS) --srcdir=$(LDAP_DIR)
 	$(TOUCH_TARGET)
 
 $(LDAPLA) $(LIBLBERLA): $(LDAP_BUILDDIR)/Makefile