<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][15718] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=15718">15718</a></dd>
<dt>Author</dt> <dd>mikej</dd>
<dt>Date</dt> <dd>2009-11-30 08:23:09 -0600 (Mon, 30 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>pass configure args/vars to sub-configure commands run from module makefiles</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkbuildmodmakerulesin">freeswitch/trunk/build/modmake.rules.in</a></li>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_curlMakefile">freeswitch/trunk/src/mod/applications/mod_curl/Makefile</a></li>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_memcacheMakefile">freeswitch/trunk/src/mod/applications/mod_memcache/Makefile</a></li>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_soundtouchMakefile">freeswitch/trunk/src/mod/applications/mod_soundtouch/Makefile</a></li>
<li><a href="#freeswitchtrunksrcmoddirectoriesmod_ldapMakefile">freeswitch/trunk/src/mod/directories/mod_ldap/Makefile</a></li>
<li><a href="#freeswitchtrunksrcmodformatsmod_shoutMakefile">freeswitch/trunk/src/mod/formats/mod_shout/Makefile</a></li>
<li><a href="#freeswitchtrunksrcmodlanguagesmod_yamlMakefile">freeswitch/trunk/src/mod/languages/mod_yaml/Makefile</a></li>
<li><a href="#freeswitchtrunksrcmodxml_intmod_xml_ldapMakefile">freeswitch/trunk/src/mod/xml_int/mod_xml_ldap/Makefile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkbuildmodmakerulesin"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/build/modmake.rules.in (15717 => 15718)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/build/modmake.rules.in 2009-11-30 12:31:24 UTC (rev 15717)
+++ freeswitch/trunk/build/modmake.rules.in 2009-11-30 14:23:09 UTC (rev 15718)
</span><span class="lines">@@ -3,6 +3,10 @@
</span><span class="cx"> switch_builddir=@switch_builddir@
</span><span class="cx"> switch_srcdir=@switch_srcdir@
</span><span class="cx">
</span><ins>+build=@build@
+host=@host@
+target=$(host)
+
</ins><span class="cx"> CC=@CC@
</span><span class="cx"> CXX=@CXX@
</span><span class="cx"> AWK=@AWK@
</span><span class="lines">@@ -37,11 +41,15 @@
</span><span class="cx"> LIBTOOL_LIB_EXTEN = @LIBTOOL_LIB_EXTEN@
</span><span class="cx"> SOLINK = @SOLINK@
</span><span class="cx">
</span><ins>+CFLAGS=@CFLAGS@
</ins><span class="cx"> LDFLAGS=@SWITCH_AM_LDFLAGS@ @LDFLAGS@ $(OUR_LDFLAGS)
</span><span class="cx">
</span><span class="cx"> ALL_CFLAGS = $(LOCAL_CFLAGS) $(MOD_CFLAGS) @SWITCH_AM_CFLAGS@ @CFLAGS@ -D_GNU_SOURCE $(OUR_CFLAGS)
</span><span class="cx"> ALL_CXXFLAGS = $(LOCAL_CFLAGS) $(MOD_CFLAGS) @SWITCH_AM_CXXFLAGS@ @CXXFLAGS@ -D_GNU_SOURCE $(OUR_CFLAGS)
</span><span class="cx">
</span><ins>+DEFAULT_ARGS:= --build=$(build) --host=$(host) --target=$(target) --prefix=$(PREFIX) --disable-shared --with-pic
+DEFAULT_VARS:= CFLAGS="$(ALL_CFLAGS)" CPPFLAGS="$(ALL_CXXFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" CXX="$(CXX)"
+
</ins><span class="cx"> COMPILE = $(CC) $(ALL_CFLAGS) $(DEFS)
</span><span class="cx"> LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(COMPILE)
</span><span class="cx"> LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(ALL_CFLAGS) $(LDFLAGS) -shared -module -avoid-version -rpath $(MODINSTDIR) -o $@
</span></span></pre></div>
<a id="freeswitchtrunksrcmodapplicationsmod_curlMakefile"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_curl/Makefile (15717 => 15718)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_curl/Makefile 2009-11-30 12:31:24 UTC (rev 15717)
+++ freeswitch/trunk/src/mod/applications/mod_curl/Makefile 2009-11-30 14:23:09 UTC (rev 15718)
</span><span class="lines">@@ -11,15 +11,13 @@
</span><span class="cx">
</span><span class="cx"> include $(BASE)/build/modmake.rules
</span><span class="cx">
</span><del>-DEFAULT_ARGS=--prefix=$(PREFIX) --disable-shared --with-pic
-
</del><span class="cx"> $(LOCAL_OBJS): $(LOCAL_SOURCES)
</span><span class="cx">
</span><span class="cx"> $(JSON_DIR):
</span><span class="cx"> $(GETLIB) $(json-c).tar.gz
</span><span class="cx">
</span><span class="cx"> $(JSON_DIR)/Makefile: $(JSON_DIR)
</span><del>- cd $(JSON_DIR) && CFLAGS=$(AM_CFLAGS) CC=$(CC) CXX=$(CXX) ./configure --disable-shared --with-pic CPPFLAGS= LDFLAGS=
</del><ins>+ cd $(JSON_DIR) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS) CPPFLAGS= LDFLAGS=
</ins><span class="cx"> $(TOUCH_TARGET)
</span><span class="cx">
</span><span class="cx"> $(JSONLA): $(JSON_DIR)/Makefile
</span></span></pre></div>
<a id="freeswitchtrunksrcmodapplicationsmod_memcacheMakefile"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_memcache/Makefile (15717 => 15718)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_memcache/Makefile 2009-11-30 12:31:24 UTC (rev 15717)
+++ freeswitch/trunk/src/mod/applications/mod_memcache/Makefile 2009-11-30 14:23:09 UTC (rev 15718)
</span><span class="lines">@@ -12,15 +12,13 @@
</span><span class="cx">
</span><span class="cx"> include $(switch_srcdir)/build/modmake.rules
</span><span class="cx">
</span><del>-DEFAULT_ARGS=--prefix=$(PREFIX) --disable-shared --with-pic
-
</del><span class="cx"> $(LOCAL_OBJS): $(LOCAL_SOURCES)
</span><span class="cx">
</span><span class="cx"> $(MEMCACHED_DIR):
</span><span class="cx"> $(GETLIB) $(MEMCACHED).tar.gz
</span><span class="cx">
</span><span class="cx"> $(MEMCACHED_DIR)/Makefile: $(MEMCACHED_DIR)
</span><del>- cd $(MEMCACHED_DIR) && CFLAGS=$(AM_CFLAGS) CC=$(CC) CXX=$(CXX) ./configure --disable-shared --with-pic --with-memcached=no CPPFLAGS= LDFLAGS=
</del><ins>+ cd $(MEMCACHED_DIR) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS) --with-memcached=no CPPFLAGS= LDFLAGS=
</ins><span class="cx"> $(TOUCH_TARGET)
</span><span class="cx">
</span><span class="cx"> $(MEMCACHEDLA): $(MEMCACHED_DIR)/Makefile
</span></span></pre></div>
<a id="freeswitchtrunksrcmodapplicationsmod_soundtouchMakefile"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_soundtouch/Makefile (15717 => 15718)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_soundtouch/Makefile 2009-11-30 12:31:24 UTC (rev 15717)
+++ freeswitch/trunk/src/mod/applications/mod_soundtouch/Makefile 2009-11-30 14:23:09 UTC (rev 15718)
</span><span class="lines">@@ -5,13 +5,12 @@
</span><span class="cx"> BASE=../../../..
</span><span class="cx"> LOCAL_CFLAGS += -I$(DIRECTORY)/include -DINTEGER_SAMPLES
</span><span class="cx"> LOCAL_LIBADD=$(LA)
</span><del>-DEFAULT_ARGS=--prefix=$(PREFIX) --disable-shared --with-pic
</del><span class="cx">
</span><span class="cx"> include $(BASE)/build/modmake.rules
</span><span class="cx">
</span><span class="cx"> $(DIRECTORY)/Makefile $(DIRECTORY)/config.status:
</span><span class="cx"> $(GETLIB) $(VERSION).tar.gz
</span><del>- cd $(DIRECTORY) && ./configure $(DEFAULT_ARGS) --enable-integer-samples
</del><ins>+ cd $(DIRECTORY) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS) --enable-integer-samples
</ins><span class="cx"> $(TOUCH_TARGET)
</span><span class="cx">
</span><span class="cx"> $(LA): $(DIRECTORY)/Makefile $(DIRECTORY)/config.status
</span></span></pre></div>
<a id="freeswitchtrunksrcmoddirectoriesmod_ldapMakefile"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/directories/mod_ldap/Makefile (15717 => 15718)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/directories/mod_ldap/Makefile 2009-11-30 12:31:24 UTC (rev 15717)
+++ freeswitch/trunk/src/mod/directories/mod_ldap/Makefile 2009-11-30 14:23:09 UTC (rev 15718)
</span><span class="lines">@@ -8,16 +8,15 @@
</span><span class="cx">
</span><span class="cx"> LOCAL_CFLAGS=-DWITH_OPENLDAP -DLDAP_DEPRECATED -I$(LDAP_DIR)/include
</span><span class="cx">
</span><del>-DEFAULT_ARGS= --prefix=$(PREFIX) --disable-shared --with-pic --disable-slapd
-DEFAULT_ARGS+= --disable-bdb --disable-hdb
-
</del><span class="cx"> LOCAL_LIBADD=$(LDAPLA) $(LIBLBERLA)
</span><span class="cx">
</span><span class="cx"> include $(switch_srcdir)/build/modmake.rules
</span><span class="cx">
</span><ins>+DEFAULT_ARGS+= --disable-slapd --disable-bdb --disable-hdb
+
</ins><span class="cx"> $(LDAP_DIR):
</span><span class="cx"> $(GETLIB) $(LDAP).tar.gz
</span><del>- cd $(LDAP_DIR) && CFLAGS="`echo $(CFLAGS) | sed -e 's:-std=c99::'`" ./configure $(DEFAULT_ARGS)
</del><ins>+ cd $(LDAP_DIR) && $(DEFAULT_VARS) CFLAGS="`echo $(CFLAGS) | sed -e 's:-std=c99::'`" ./configure $(DEFAULT_ARGS)
</ins><span class="cx">
</span><span class="cx"> $(LDAPLA) $(LIBLBERLA): $(LDAP_DIR)
</span><span class="cx"> cd $(LDAP_DIR) && $(MAKE)
</span></span></pre></div>
<a id="freeswitchtrunksrcmodformatsmod_shoutMakefile"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/formats/mod_shout/Makefile (15717 => 15718)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/formats/mod_shout/Makefile 2009-11-30 12:31:24 UTC (rev 15717)
+++ freeswitch/trunk/src/mod/formats/mod_shout/Makefile 2009-11-30 14:23:09 UTC (rev 15718)
</span><span class="lines">@@ -22,15 +22,13 @@
</span><span class="cx">
</span><span class="cx"> include $(switch_srcdir)/build/modmake.rules
</span><span class="cx">
</span><del>-DEFAULT_ARGS=--prefix=$(PREFIX) --disable-shared --with-pic
-
</del><span class="cx"> $(LOCAL_OBJS): $(LOCAL_SOURCES)
</span><span class="cx">
</span><span class="cx"> $(MPG123_DIR):
</span><span class="cx"> $(GETLIB) $(MPG123).tar.gz
</span><span class="cx">
</span><span class="cx"> $(MPG123_DIR)/Makefile: $(MPG123_DIR)
</span><del>- cd $(MPG123_DIR) && CFLAGS=$(AM_CFLAGS) CC=$(CC) CXX=$(CXX) ./configure --disable-shared --with-pic CPPFLAGS= LDFLAGS=
</del><ins>+ cd $(MPG123_DIR) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS) CPPFLAGS= LDFLAGS=
</ins><span class="cx"> $(TOUCH_TARGET)
</span><span class="cx">
</span><span class="cx"> $(MPG123LA): $(MPG123_DIR)/Makefile
</span><span class="lines">@@ -41,7 +39,7 @@
</span><span class="cx"> $(GETLIB) $(LAME).tar.gz
</span><span class="cx">
</span><span class="cx"> $(LAME_DIR)/Makefile: $(LAME_DIR)
</span><del>- cd $(LAME_DIR) && CC=$(CC) CXX=$(CXX) ./configure $(DEFAULT_ARGS) --disable-decoder CPPFLAGS= LDFLAGS=
</del><ins>+ cd $(LAME_DIR) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS) --disable-decoder CPPFLAGS= LDFLAGS=
</ins><span class="cx"> $(TOUCH_TARGET)
</span><span class="cx">
</span><span class="cx"> $(LAMELA): $(LAME_DIR)/Makefile
</span><span class="lines">@@ -52,7 +50,7 @@
</span><span class="cx"> $(GETLIB) $(SHOUT).tar.gz
</span><span class="cx">
</span><span class="cx"> $(SHOUT_DIR)/Makefile: $(SHOUT_DIR)
</span><del>- cd $(SHOUT_DIR) && CC=$(CC) CXX=$(CXX) ./configure $(DEFAULT_ARGS) --without-speex --without-vorbis --without-ogg CPPFLAGS= LDFLAGS=
</del><ins>+ cd $(SHOUT_DIR) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS) --without-speex --without-vorbis --without-ogg CPPFLAGS= LDFLAGS=
</ins><span class="cx"> $(TOUCH_TARGET)
</span><span class="cx">
</span><span class="cx"> $(SHOUTLA): $(SHOUT_DIR)/Makefile
</span></span></pre></div>
<a id="freeswitchtrunksrcmodlanguagesmod_yamlMakefile"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/languages/mod_yaml/Makefile (15717 => 15718)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/languages/mod_yaml/Makefile 2009-11-30 12:31:24 UTC (rev 15717)
+++ freeswitch/trunk/src/mod/languages/mod_yaml/Makefile 2009-11-30 14:23:09 UTC (rev 15718)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> local_depend: $(LIBYAML_A)
</span><span class="cx">
</span><span class="cx"> $(LIBYAML_A):
</span><del>- cd $(YAMLLIB) && ./configure $(DEFAULT_ARGS) --disable-shared --with-pic
</del><ins>+ cd $(YAMLLIB) && $(DEFAULT_VARS) ./configure $(DEFAULT_ARGS)
</ins><span class="cx"> cd $(YAMLLIB) && $(MAKE)
</span><span class="cx">
</span><span class="cx"> yamlclean:
</span></span></pre></div>
<a id="freeswitchtrunksrcmodxml_intmod_xml_ldapMakefile"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_ldap/Makefile (15717 => 15718)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/xml_int/mod_xml_ldap/Makefile 2009-11-30 12:31:24 UTC (rev 15717)
+++ freeswitch/trunk/src/mod/xml_int/mod_xml_ldap/Makefile 2009-11-30 14:23:09 UTC (rev 15718)
</span><span class="lines">@@ -9,16 +9,15 @@
</span><span class="cx">
</span><span class="cx"> LOCAL_CFLAGS=-DWITH_OPENLDAP -DLDAP_DEPRECATED -I$(LDAP_DIR)/include
</span><span class="cx">
</span><del>-DEFAULT_ARGS= --prefix=$(PREFIX) --disable-shared --with-pic --disable-slapd
-DEFAULT_ARGS+= --disable-slurpd --disable-relay --disable-bdb --disable-hdb
-
</del><span class="cx"> LOCAL_LIBADD=$(LDAPLA) $(LIBLBERLA) $(LIBLUTILA)
</span><span class="cx">
</span><span class="cx"> include $(switch_srcdir)/build/modmake.rules
</span><span class="cx">
</span><ins>+DEFAULT_ARGS+= --disable-slapd --disable-slurpd --disable-relay --disable-bdb --disable-hdb
+
</ins><span class="cx"> $(LDAP_DIR):
</span><span class="cx"> $(GETLIB) $(LDAP).tar.gz
</span><del>- cd $(LDAP_DIR) && CFLAGS="`echo $(CFLAGS) | sed -e 's:-std=c99::'`" ./configure $(DEFAULT_ARGS)
</del><ins>+ cd $(LDAP_DIR) && $(DEFAULT_VARS) CFLAGS="`echo $(CFLAGS) | sed -e 's:-std=c99::'`" ./configure $(DEFAULT_ARGS)
</ins><span class="cx">
</span><span class="cx"> $(LIBLUTILA) $(LDAPLA) $(LIBLBERLA): $(LDAP_DIR)
</span><span class="cx"> cd $(LDAP_DIR) && $(MAKE)
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>