<!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][16238] </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=16238">16238</a></dd>
<dt>Author</dt> <dd>mikej</dd>
<dt>Date</dt> <dd>2010-01-11 08:36:29 -0600 (Mon, 11 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>wip move towards adding directory layout control to configure</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkMakefileam">freeswitch/trunk/Makefile.am</a></li>
<li><a href="#freeswitchtrunkbuildmodmakerulesin">freeswitch/trunk/build/modmake.rules.in</a></li>
<li><a href="#freeswitchtrunkbuildmodmakerulesam">freeswitch/trunk/build/modmake.rulesam</a></li>
<li><a href="#freeswitchtrunkconfigurein">freeswitch/trunk/configure.in</a></li>
<li><a href="#freeswitchtrunksrcswitch_corec">freeswitch/trunk/src/switch_core.c</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#freeswitchtrunkbuildconfiglayout">freeswitch/trunk/build/config.layout</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkMakefileam"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/Makefile.am (16237 => 16238)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/Makefile.am 2010-01-11 11:33:18 UTC (rev 16237)
+++ freeswitch/trunk/Makefile.am 2010-01-11 14:36:29 UTC (rev 16238)
</span><span class="lines">@@ -317,11 +317,10 @@
</span><span class="cx">
</span><span class="cx"> install-data-local:
</span><span class="cx"> @echo Installing $(NAME)
</span><del>- @for x in mod db log log/xml_cdr bin scripts grammar recordings ; do \
- $(mkinstalldirs) $(DESTDIR)$(prefix)/$$x ; \
</del><ins>+ @for x in @modulesdir@ @runtimedir@ @dbdir@ @logfiledir@ @logfiledir@/xml_cdr @bindir@ @scriptdir@ @recordingsdir@ ; do \
+ $(mkinstalldirs) $(DESTDIR)$$x ; \
</ins><span class="cx"> done
</span><del>- $(mkinstalldirs) $(DESTDIR)@recordingsdir@
- $(mkinstalldirs) $(DESTDIR)@modinstdir@
</del><ins>+ $(mkinstalldirs) $(DESTDIR)$(prefix)/grammar
</ins><span class="cx"> test -d $(DESTDIR)@confdir@ || $(MAKE) samples-conf
</span><span class="cx"> test -d $(DESTDIR)$(prefix)/htdocs || $(MAKE) samples-htdocs
</span><span class="cx">
</span><span class="lines">@@ -530,7 +529,7 @@
</span><span class="cx">
</span><span class="cx"> scripts/fsxs: scripts/fsxs.in
</span><span class="cx"> @echo creating fsxs
</span><del>- @sed -e "s,@MODULES_DIR\@,@modinstdir@," \
</del><ins>+ @sed -e "s,@MODULES_DIR\@,@modulesdir@," \
</ins><span class="cx"> -e "s,@LIB_DIR\@,@libdir@," \
</span><span class="cx"> -e "s,@BIN_DIR\@,@bindir@," \
</span><span class="cx"> -e "s,@INC_DIR\@,@includedir@," \
</span></span></pre></div>
<a id="freeswitchtrunkbuildconfiglayout"></a>
<div class="addfile"><h4>Added: freeswitch/trunk/build/config.layout (0 => 16238)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/build/config.layout (rev 0)
+++ freeswitch/trunk/build/config.layout 2010-01-11 14:36:29 UTC (rev 16238)
</span><span class="lines">@@ -0,0 +1,66 @@
</span><ins>+##
+## config.layout -- Pre-defined Installation Path Layouts
+##
+## Hints:
+## - layouts can be loaded with configure's --enable-layout=ID option
+## - when no --enable-layout option is given, the default layout is `FreeSWITCH'
+## - a trailing plus character (`+') on paths is replaced with a
+## `/<target>' suffix where <target> is currently hardcoded to 'freeswitch'.
+## (This may become a configurable parameter at some point.)
+##
+
+# Default FreeSWITCH path layout.
+<Layout FreeSWITCH>
+ prefix: /usr/local/freeswitch
+ exec_prefix: ${prefix}
+ bindir: ${exec_prefix}/bin
+ sbindir: ${exec_prefix}/bin
+ libdir: ${exec_prefix}/lib
+ libexecdir: ${exec_prefix}/modules
+ modulesdir: ${exec_prefix}/modules
+ mandir: ${prefix}/man
+ sysconfdir: ${prefix}/conf
+ datadir: ${prefix}
+ includedir: ${prefix}/include
+ localstatedir: ${prefix}
+ runtimedir: ${localstatedir}/log
+ logfiledir: ${localstatedir}/log
+</Layout>
+
+# GNU standards conforming path layout.
+# See FSF's GNU project `make-stds' document for details.
+<Layout GNU>
+ prefix: /usr/local
+ exec_prefix: ${prefix}
+ bindir: ${exec_prefix}/bin
+ sbindir: ${exec_prefix}/sbin
+ libdir: ${exec_prefix}/lib
+ libexecdir: ${exec_prefix}/libexec
+ modulesdir: ${libdir}/freeswitch/modules
+ mandir: ${prefix}/man
+ sysconfdir: ${prefix}/etc/freeswitch
+ datadir: ${prefix}/share/freeswitch
+ includedir: ${prefix}/include/freeswitch
+ localstatedir: ${prefix}/var/freeswitch
+ runtimedir: ${localstatedir}/run
+ logfiledir: ${localstatedir}/log
+</Layout>
+
+# Linux FHS (File Hierarchy Standard) layout
+# see
+<Layout FHS>
+ prefix: /usr
+ exec_prefix: ${prefix}
+ bindir: ${exec_prefix}/bin
+ sbindir: ${exec_prefix}/sbin
+ libdir: ${exec_prefix}/lib/freeswitch
+ libexecdir: ${exec_prefix}/libexec
+ modulesdir: ${libdir}/modules
+ mandir: ${prefix}/man
+ sysconfdir: /etc/freeswitch
+ datadir: ${prefix}/share/freeswitch
+ includedir: ${prefix}/include/freeswitch
+ localstatedir: /var/lib/freeswitch
+ runtimedir: /var/run/freeswitch
+ logfiledir: /var/log/freeswitch
+</Layout>
</ins></span></pre></div>
<a id="freeswitchtrunkbuildmodmakerulesin"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/build/modmake.rules.in (16237 => 16238)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/build/modmake.rules.in 2010-01-11 11:33:18 UTC (rev 16237)
+++ freeswitch/trunk/build/modmake.rules.in 2010-01-11 14:36:29 UTC (rev 16238)
</span><span class="lines">@@ -7,6 +7,17 @@
</span><span class="cx"> host=@host@
</span><span class="cx"> target=$(host)
</span><span class="cx">
</span><ins>+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+libexecdir=@libexecdir@
+includedir=@includedir@
+modulesdir=@modulesdir@
+runtimedir=@runtimedir@
+logfiledir=@logfiledir@
+sysconfdir=@sysconfdir@
+localstatedir=@localstatedir@
+
</ins><span class="cx"> CC=@CC@
</span><span class="cx"> CXX=@CXX@
</span><span class="cx"> AWK=@AWK@
</span><span class="lines">@@ -31,8 +42,6 @@
</span><span class="cx">
</span><span class="cx"> LIBS=$(switch_builddir)/libfreeswitch.la
</span><span class="cx"> DEFS=@DEFS@
</span><del>-PREFIX = @prefix@
-MODINSTDIR = @modinstdir@
</del><span class="cx">
</span><span class="cx"> DYLD_LIBRARY_PATH=@libdir@:$DYLD_LIBRARY_PATH
</span><span class="cx"> LD_LIBRARY_PATH=@libdir@:$LD_LIBRARY_PATH
</span><span class="lines">@@ -46,18 +55,20 @@
</span><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@ @SWITCH_ANSI_CFLAGS@ -D_GNU_SOURCE $(OUR_CFLAGS)
</span><del>-ALL_CXXFLAGS = $(LOCAL_CFLAGS) $(MOD_CFLAGS) @SWITCH_AM_CXXFLAGS@ @CXXFLAGS@ -D_GNU_SOURCE $(OUR_CFLAGS)
</del><ins>+ALL_CXXFLAGS = $(LOCAL_CFLAGS) $(MOD_CFLAGS) @SWITCH_AM_CXXFLAGS@ @CXXFLAGS@ -D_GNU_SOURCE $(OUR_CFLAGS)
</ins><span class="cx">
</span><del>-DEFAULT_ARGS:= --build=$(build) --host=$(host) --target=$(target) --prefix=$(PREFIX) --disable-shared --with-pic
</del><span class="cx"> DEFAULT_VARS:= CFLAGS="$(CFLAGS)" CPPFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" CXX="$(CXX)"
</span><ins>+DEFAULT_ARGS:= --build=$(build) --host=$(host) --target=$(target) \
+ --prefix="$(prefix)" --exec_prefix="$(exec_prefix)" --libdir="$(libdir)" \
+ --disable-shared --with-pic
</ins><span class="cx">
</span><del>-COMPILE = $(CC) $(ALL_CFLAGS) $(DEFS)
</del><ins>+COMPILE = $(CC) $(ALL_CFLAGS) $(DEFS)
</ins><span class="cx"> LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(COMPILE)
</span><del>-LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(ALL_CFLAGS) $(LDFLAGS) -shared -module -avoid-version -rpath $(MODINSTDIR) -o $@
</del><ins>+LINK = $(LIBTOOL) --mode=link --tag=CC $(CCLD) $(ALL_CFLAGS) $(LDFLAGS) -shared -module -avoid-version -rpath $(modulesdir) -o $@
</ins><span class="cx">
</span><span class="cx"> CXXCOMPILE = $(CXX) $(ALL_CXXFLAGS) $(DEFS)
</span><span class="cx"> LTCXXCOMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXXCOMPILE)
</span><del>-CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(ALL_CXXFLAGS) $(LDFLAGS) -shared -module -avoid-version -rpath $(MODINSTDIR) -o $@
</del><ins>+CXXLINK = $(LIBTOOL) --mode=link --tag=CXX $(CXXLD) $(ALL_CXXFLAGS) $(LDFLAGS) -shared -module -avoid-version -rpath $(modulesdir) -o $@
</ins><span class="cx">
</span><span class="cx"> CSOURCEFILE=$(MODNAME).c
</span><span class="cx"> CXXSOURCEFILE=$(MODNAME).cpp
</span><span class="lines">@@ -128,22 +139,22 @@
</span><span class="cx"> @test -d .libs || mkdir .libs
</span><span class="cx"> @error="";\
</span><span class="cx"> if test -f "$(CSOURCEFILE)" -o -f "$(MODDIR)/$(CSOURCEFILE)"; then \
</span><del>- $(LINK) $(SOLINK) $(MODNAME).lo $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(OUR_OBJS) $(LOCAL_LIBADD) $(LOCAL_LDFLAGS_POST) $(LINK_OUTPUT_REDIR) ;\
</del><ins>+ $(LINK) $(SOLINK) $(MODNAME).lo $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(OUR_OBJS) $(LOCAL_LIBADD) $(LOCAL_LDFLAGS_POST) $(LINK_OUTPUT_REDIR) ;\
</ins><span class="cx"> else \
</span><del>- $(CXXLINK) $(SOLINK) $(MODNAME).lo $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(OUR_OBJS) $(LOCAL_LIBADD) $(LOCAL_LDFLAGS_POST) $(LINK_OUTPUT_REDIR) ;\
</del><ins>+ $(CXXLINK) $(SOLINK) $(MODNAME).lo $(LIBS) $(LOCAL_LDFLAGS) $(LOCAL_OBJS) $(OUR_OBJS) $(LOCAL_LIBADD) $(LOCAL_LDFLAGS_POST) $(LINK_OUTPUT_REDIR) ;\
</ins><span class="cx"> fi;
</span><span class="cx">
</span><span class="cx"> mod_clean:
</span><span class="cx"> @rm -fr *.$(LIBTOOL_LIB_EXTEN) *.o *.lo *~ .libs $(LOCAL_OBJS)
</span><span class="cx">
</span><del>-mod_install: $(DESTDIR)$(MODINSTDIR)/$(MODNAME).$(LIBTOOL_LIB_EXTEN)
</del><ins>+mod_install: $(DESTDIR)$(modulesdir)/$(MODNAME).$(LIBTOOL_LIB_EXTEN)
</ins><span class="cx">
</span><del>-$(DESTDIR)$(MODINSTDIR)/$(MODNAME).$(LIBTOOL_LIB_EXTEN):$(MODNAME).$(LIBTOOL_LIB_EXTEN)
</del><ins>+$(DESTDIR)$(modulesdir)/$(MODNAME).$(LIBTOOL_LIB_EXTEN):$(MODNAME).$(LIBTOOL_LIB_EXTEN)
</ins><span class="cx"> @echo installing $<
</span><del>- @$(LTINSTALL) $(MODNAME).$(LIBTOOL_LIB_EXTEN) $(DESTDIR)$(MODINSTDIR) >/dev/null
</del><ins>+ @$(LTINSTALL) $(MODNAME).$(LIBTOOL_LIB_EXTEN) $(DESTDIR)$(modulesdir) >/dev/null
</ins><span class="cx">
</span><span class="cx"> mod_uninstall:
</span><del>- @$(LTUNINSTALL) $(DESTDIR)$(MODINSTDIR)/$(MODNAME).$(LIBTOOL_LIB_EXTEN)
</del><ins>+ @$(LTUNINSTALL) $(DESTDIR)$(modulesdir)/$(MODNAME).$(LIBTOOL_LIB_EXTEN)
</ins><span class="cx">
</span><span class="cx"> # define these in your makefile if you wish
</span><span class="cx"> local_all local_depend local_clean depend_install local_install local_distclean local_extraclean local_uninstall:
</span></span></pre></div>
<a id="freeswitchtrunkbuildmodmakerulesam"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/build/modmake.rulesam (16237 => 16238)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/build/modmake.rulesam 2010-01-11 11:33:18 UTC (rev 16237)
+++ freeswitch/trunk/build/modmake.rulesam 2010-01-11 14:36:29 UTC (rev 16238)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> # Dirty trick to override the link output
</span><span class="cx"> LIBS+=> $(MODNAME).log || error="yes";if test -n "$(VERBOSE)" -o "$$error" = "yes";then cat $(MODNAME).log;fi;if test "$$error" = "yes";then exit 1;fi
</span><span class="cx">
</span><del>-moddir=@modinstdir@
</del><ins>+moddir=@modulesdir@
</ins><span class="cx">
</span><span class="cx"> all-modules: all
</span><span class="cx"> depend-modules: depend
</span></span></pre></div>
<a id="freeswitchtrunkconfigurein"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/configure.in (16237 => 16238)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/configure.in 2010-01-11 11:33:18 UTC (rev 16237)
+++ freeswitch/trunk/configure.in 2010-01-11 14:36:29 UTC (rev 16238)
</span><span class="lines">@@ -34,18 +34,28 @@
</span><span class="cx">
</span><span class="cx"> # Where to install the modules
</span><span class="cx"> AC_ARG_WITH([modinstdir],
</span><del>- [AS_HELP_STRING([--with-modinstdir=DIR], [Install modules into this location (default: $prefix/mod)])], [modinstdir="$withval"], [modinstdir="${prefix}/mod"])
</del><ins>+ [AS_HELP_STRING([--with-modinstdir=DIR], [Install modules into this location (default: $prefix/mod)])], [modulesdir="$withval"], [modulesdir="${prefix}/mod"])
+AC_SUBST(modulesdir)
+AC_DEFINE_UNQUOTED([SWITCH_MOD_DIR],"${modulesdir}",[where to install the modules to])
</ins><span class="cx">
</span><del>-AC_SUBST(modinstdir)
-AC_DEFINE_UNQUOTED([SWITCH_MOD_DIR],"${modinstdir}",[where to install the modules to])
-
</del><span class="cx"> # Where to put pidfile
</span><span class="cx"> AC_ARG_WITH([rundir],
</span><del>- [AS_HELP_STRING([--with-rundir=DIR], [Put pidfile into this location (default: $prefix/log)])], [rundir="$withval"], [rundir="${prefix}/log"])
</del><ins>+ [AS_HELP_STRING([--with-rundir=DIR], [Put pidfile into this location (default: $prefix/run)])], [runtimedir="$withval"], [runtimedir="${prefix}/run"])
+AC_SUBST(runtimedir)
+AC_DEFINE_UNQUOTED([SWITCH_RUN_DIR],"${runtimedir}",[where to put pidfile to])
</ins><span class="cx">
</span><del>-AC_SUBST(rundir)
-AC_DEFINE_UNQUOTED([SWITCH_RUN_DIR],"${rundir}",[where to put pidfile to])
</del><ins>+logfiledir="${prefix}/log"
+AC_SUBST(logfiledir)
+AC_DEFINE_UNQUOTED([SWITCH_LOG_DIR],"${logfiledir}",[where to put log files])
</ins><span class="cx">
</span><ins>+dbdir="${prefix}/db"
+AC_SUBST(dbdir)
+AC_DEFINE_UNQUOTED([SWITCH_DB_DIR],"${dbdir}",[where to put db files])
+
+scriptdir="${prefix}/scripts"
+AC_SUBST(scriptdir)
+AC_DEFINE_UNQUOTED([SWITCH_SCRIPT_DIR],"${scriptdir}",[where to put script files])
+
</ins><span class="cx"> recordingsdir="${prefix}/recordings"
</span><span class="cx"> AC_SUBST(recordingsdir)
</span><span class="cx"> AC_DEFINE_UNQUOTED([SWITCH_RECORDINGS_DIR],"${recordingsdir}",[where to put recording files])
</span><span class="lines">@@ -56,6 +66,8 @@
</span><span class="cx"> confdir="$sysconfdir"
</span><span class="cx"> fi
</span><span class="cx">
</span><ins>+sysconfdir="$confdir"
+
</ins><span class="cx"> AC_SUBST(confdir)
</span><span class="cx"> AC_DEFINE_UNQUOTED([SWITCH_CONF_DIR],"${confdir}",[directory for configuration files])
</span><span class="cx">
</span><span class="lines">@@ -887,33 +899,56 @@
</span><span class="cx"> AC_SUBST(OUR_DISABLED_UNINSTALL_MODS)
</span><span class="cx"> AC_SUBST(AM_MAKEFLAGS)
</span><span class="cx">
</span><del>-ac_configure_args="$ac_configure_args \"CONFIGURE_CFLAGS=$CFLAGS\" \"CONFIGURE_CXXFLAGS=$CXXFLAGS\" \"CONFIGURE_LDFLAGS=$LDFLAGS\""
</del><ins>+ac_configure_args="$ac_configure_args \"CONFIGURE_CFLAGS=$CFLAGS\" \"CONFIGURE_CXXFLAGS=$CXXFLAGS\" \"CONFIGURE_LDFLAGS=$LDFLAGS\" \
+ --prefix='$prefix' --exec_prefix='$exec_prefix' --libdir='$libdir' --libexecdir='$libexecdir' --bindir='$bindir' --sbindir='$sbindir' \
+ --localstatedir='$localstatedir' --datadir='$datadir'"
</ins><span class="cx">
</span><span class="cx"> # Run configure in all the subdirs
</span><del>-AC_CONFIG_SUBDIRS(libs/srtp)
-AC_CONFIG_SUBDIRS(libs/sqlite)
</del><ins>+AC_CONFIG_SUBDIRS([libs/srtp])
+AC_CONFIG_SUBDIRS([libs/sqlite])
</ins><span class="cx"> if test "$enable_core_libedit_support" = "yes" ; then
</span><del>- AC_CONFIG_SUBDIRS(libs/libedit)
</del><ins>+ AC_CONFIG_SUBDIRS([libs/libedit])
</ins><span class="cx"> fi
</span><span class="cx">
</span><del>-AC_CONFIG_SUBDIRS(libs/pcre)
-AC_CONFIG_SUBDIRS(libs/apr)
-AC_CONFIG_SUBDIRS(libs/apr-util)
-AC_CONFIG_SUBDIRS(libs/ilbc)
-AC_CONFIG_SUBDIRS(libs/curl)
-AC_CONFIG_SUBDIRS(libs/iksemel)
-AC_CONFIG_SUBDIRS(libs/js/nsprpub)
-AC_CONFIG_SUBDIRS(libs/js)
-AC_CONFIG_SUBDIRS(libs/libdingaling)
-AC_CONFIG_SUBDIRS(libs/libsndfile)
-AC_CONFIG_SUBDIRS(libs/sofia-sip)
-AC_CONFIG_SUBDIRS(libs/speex)
-AC_CONFIG_SUBDIRS(libs/portaudio)
-AC_CONFIG_SUBDIRS(libs/openzap)
-AC_CONFIG_SUBDIRS(libs/unimrcp)
-AC_CONFIG_SUBDIRS(libs/tiff-3.8.2)
-AC_CONFIG_SUBDIRS(libs/spandsp)
-AC_CONFIG_SUBDIRS(libs/broadvoice)
-AC_CONFIG_SUBDIRS(libs/libg722_1)
</del><ins>+AC_CONFIG_SUBDIRS([libs/pcre])
+AC_CONFIG_SUBDIRS([libs/apr])
+AC_CONFIG_SUBDIRS([libs/apr-util])
+AC_CONFIG_SUBDIRS([libs/ilbc])
+AC_CONFIG_SUBDIRS([libs/curl])
+AC_CONFIG_SUBDIRS([libs/iksemel])
+AC_CONFIG_SUBDIRS([libs/js/nsprpub])
+AC_CONFIG_SUBDIRS([libs/js])
+AC_CONFIG_SUBDIRS([libs/libdingaling])
+AC_CONFIG_SUBDIRS([libs/libsndfile])
+AC_CONFIG_SUBDIRS([libs/sofia-sip])
+AC_CONFIG_SUBDIRS([libs/speex])
+AC_CONFIG_SUBDIRS([libs/portaudio])
+AC_CONFIG_SUBDIRS([libs/openzap])
+AC_CONFIG_SUBDIRS([libs/unimrcp])
+AC_CONFIG_SUBDIRS([libs/tiff-3.8.2])
+AC_CONFIG_SUBDIRS([libs/spandsp])
+AC_CONFIG_SUBDIRS([libs/broadvoice])
+AC_CONFIG_SUBDIRS([libs/libg722_1])
</ins><span class="cx">
</span><span class="cx"> AC_OUTPUT
</span><ins>+
+##
+## Configuration summary
+##
+
+echo
+echo "-------------------------- FreeSWITCH configuration ------------------------"
+echo ""
+echo " Locations:"
+echo " Selected layout: ${layout_name}"
+echo ""
+echo " prefix: ${prefix}"
+echo " exec_prefix: ${exec_prefix}"
+echo " bindir: ${bindir}"
+echo " libdir: ${libdir}"
+echo " modulesdir: ${modulesdir}"
+echo " sysconfdir: ${sysconfdir}"
+echo " runtimedir: ${runtimedir}"
+echo " logfiledir: ${logfiledir}"
+echo ""
+echo "----------------------------------------------------------------------------"
</ins></span></pre></div>
<a id="freeswitchtrunksrcswitch_corec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core.c (16237 => 16238)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core.c 2010-01-11 11:33:18 UTC (rev 16237)
+++ freeswitch/trunk/src/switch_core.c 2010-01-11 14:36:29 UTC (rev 16238)
</span><span class="lines">@@ -454,7 +454,7 @@
</span><span class="cx"> #ifdef SWITCH_RUN_DIR
</span><span class="cx"> switch_snprintf(SWITCH_GLOBAL_dirs.run_dir, BUFSIZE, "%s", SWITCH_RUN_DIR);
</span><span class="cx"> #else
</span><del>- switch_snprintf(SWITCH_GLOBAL_dirs.run_dir, BUFSIZE, "%s%slog", base_dir, SWITCH_PATH_SEPARATOR);
</del><ins>+ switch_snprintf(SWITCH_GLOBAL_dirs.run_dir, BUFSIZE, "%s%srun", base_dir, SWITCH_PATH_SEPARATOR);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>