kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix automake warnings for var redefined

This commit is contained in:
Brian West 2014-03-12 15:22:56 -05:00
parent 666231f91b
commit 4b935e1037
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mod/directories/mod_ldap/Makefile.am
View File

@ -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

4
src/mod/xml_int/mod_xml_ldap/Makefile.am
View File

@ -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