- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r11753 - freeswitch/trunk/src
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: anthm Date: Wed Feb 11 08:52:39 2009 New Revision: 11753 Log: FSCORE-293 Modified: freeswitch/trunk/src/switch_ivr_bridge.c Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Wed Feb 11 08:52:39 2009 @@ -579,7 +579,7 @@ if ((other_uuid = switch_channel_get_variable(channel, SWITCH_UUID_BRIDGE)) && (other_session = switch_core_session_locate(other_uuid))) { switch_channel_t *other_channel = switch_core_session_get_channel(other_session); switch_event_t *event; - uint8_t ready_a, ready_b; + int ready_a, ready_b; switch_channel_state_t state; switch_channel_set_variable(channel, SWITCH_UUID_BRIDGE, NULL);

1 0

[commit] r11752 - freeswitch/trunk/debian
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: nicholas Date: Wed Feb 11 06:35:56 2009 New Revision: 11752 Log: Debian rules now points conf files to /etc/freeswitch according to debian standards Modified: freeswitch/trunk/debian/dirs freeswitch/trunk/debian/freeswitch-lang-de.conffiles freeswitch/trunk/debian/freeswitch-lang-de.install freeswitch/trunk/debian/freeswitch-lang-en.conffiles freeswitch/trunk/debian/freeswitch-lang-en.install freeswitch/trunk/debian/freeswitch-lang-fr.conffiles freeswitch/trunk/debian/freeswitch-lang-fr.install freeswitch/trunk/debian/freeswitch-lua.conffiles freeswitch/trunk/debian/freeswitch-lua.install freeswitch/trunk/debian/freeswitch-perl.conffiles freeswitch/trunk/debian/freeswitch-perl.install freeswitch/trunk/debian/freeswitch-spidermonkey.conffiles freeswitch/trunk/debian/freeswitch-spidermonkey.install freeswitch/trunk/debian/freeswitch.conffiles freeswitch/trunk/debian/freeswitch.install freeswitch/trunk/debian/postinst freeswitch/trunk/debian/postrm freeswitch/trunk/debian/rules Modified: freeswitch/trunk/debian/dirs ============================================================================== --- freeswitch/trunk/debian/dirs (original) +++ freeswitch/trunk/debian/dirs Wed Feb 11 06:35:56 2009 @@ -1,11 +1,11 @@ -opt/freeswitch/conf/dialplan/default -opt/freeswitch/conf/dialplan/public -opt/freeswitch/conf/sip_profiles/nat -opt/freeswitch/conf/sip_profiles/default -opt/freeswitch/conf/sip_profiles/outbound -opt/freeswitch/conf/directory/default -opt/freeswitch/conf/autoload_configs -opt/freeswitch/conf/jingle_profiles +etc/freeswitch/dialplan/default +etc/freeswitch/dialplan/public +etc/freeswitch/sip_profiles/nat +etc/freeswitch/sip_profiles/default +etc/freeswitch/sip_profiles/outbound +etc/freeswitch/directory/default +etc/freeswitch/autoload_configs +etc/freeswitch/jingle_profiles opt/freeswitch/log opt/freeswitch/db opt/freeswitch/bin/scripts Modified: freeswitch/trunk/debian/freeswitch-lang-de.conffiles ============================================================================== --- freeswitch/trunk/debian/freeswitch-lang-de.conffiles (original) +++ freeswitch/trunk/debian/freeswitch-lang-de.conffiles Wed Feb 11 06:35:56 2009 @@ -1,3 +1,3 @@ -/opt/freeswitch/conf/lang/de/de.xml -/opt/freeswitch/conf/lang/de/demo/demo.xml -/opt/freeswitch/conf/lang/de/vm/tts.xml +/etc/freeswitch/lang/de/de.xml +/etc/freeswitch/lang/de/demo/demo.xml +/etc/freeswitch/lang/de/vm/tts.xml Modified: freeswitch/trunk/debian/freeswitch-lang-de.install ============================================================================== --- freeswitch/trunk/debian/freeswitch-lang-de.install (original) +++ freeswitch/trunk/debian/freeswitch-lang-de.install Wed Feb 11 06:35:56 2009 @@ -1,4 +1,4 @@ -opt/freeswitch/conf/lang/de/*.xml -opt/freeswitch/conf/lang/de/demo/*.xml -opt/freeswitch/conf/lang/de/vm/*.xml +etc/freeswitch/lang/de/*.xml +etc/freeswitch/lang/de/demo/*.xml +etc/freeswitch/lang/de/vm/*.xml opt/freeswitch/mod/mod_say_de.so* Modified: freeswitch/trunk/debian/freeswitch-lang-en.conffiles ============================================================================== --- freeswitch/trunk/debian/freeswitch-lang-en.conffiles (original) +++ freeswitch/trunk/debian/freeswitch-lang-en.conffiles Wed Feb 11 06:35:56 2009 @@ -1,4 +1,4 @@ -/opt/freeswitch/conf/lang/en/en.xml -/opt/freeswitch/conf/lang/en/demo/demo.xml -/opt/freeswitch/conf/lang/en/vm/sounds.xml -/opt/freeswitch/conf/lang/en/vm/tts.xml +/etc/freeswitch/lang/en/en.xml +/etc/freeswitch/lang/en/demo/demo.xml +/etc/freeswitch/lang/en/vm/sounds.xml +/etc/freeswitch/lang/en/vm/tts.xml Modified: freeswitch/trunk/debian/freeswitch-lang-en.install ============================================================================== --- freeswitch/trunk/debian/freeswitch-lang-en.install (original) +++ freeswitch/trunk/debian/freeswitch-lang-en.install Wed Feb 11 06:35:56 2009 @@ -1,4 +1,4 @@ -opt/freeswitch/conf/lang/en/*.xml -opt/freeswitch/conf/lang/en/demo/*.xml -opt/freeswitch/conf/lang/en/vm/*.xml +etc/freeswitch/lang/en/*.xml +etc/freeswitch/lang/en/demo/*.xml +etc/freeswitch/lang/en/vm/*.xml opt/freeswitch/mod/mod_say_en.so* Modified: freeswitch/trunk/debian/freeswitch-lang-fr.conffiles ============================================================================== --- freeswitch/trunk/debian/freeswitch-lang-fr.conffiles (original) +++ freeswitch/trunk/debian/freeswitch-lang-fr.conffiles Wed Feb 11 06:35:56 2009 @@ -1,3 +1,3 @@ -/opt/freeswitch/conf/lang/fr/fr.xml -/opt/freeswitch/conf/lang/fr/demo/demo.xml -/opt/freeswitch/conf/lang/fr/vm/sounds.xml +/etc/freeswitch/lang/fr/fr.xml +/etc/freeswitch/lang/fr/demo/demo.xml +/etc/freeswitch/lang/fr/vm/sounds.xml Modified: freeswitch/trunk/debian/freeswitch-lang-fr.install ============================================================================== --- freeswitch/trunk/debian/freeswitch-lang-fr.install (original) +++ freeswitch/trunk/debian/freeswitch-lang-fr.install Wed Feb 11 06:35:56 2009 @@ -1,4 +1,4 @@ -opt/freeswitch/conf/lang/fr/*.xml -opt/freeswitch/conf/lang/fr/demo/*.xml -opt/freeswitch/conf/lang/fr/vm/*.xml +etc/freeswitch/lang/fr/*.xml +etc/freeswitch/lang/fr/demo/*.xml +etc/freeswitch/lang/fr/vm/*.xml opt/freeswitch/mod/mod_say_fr.so* Modified: freeswitch/trunk/debian/freeswitch-lua.conffiles ============================================================================== --- freeswitch/trunk/debian/freeswitch-lua.conffiles (original) +++ freeswitch/trunk/debian/freeswitch-lua.conffiles Wed Feb 11 06:35:56 2009 @@ -1 +1 @@ -/opt/freeswitch/conf/autoload_configs/lua.conf.xml +/etc/freeswitch/autoload_configs/lua.conf.xml Modified: freeswitch/trunk/debian/freeswitch-lua.install ============================================================================== --- freeswitch/trunk/debian/freeswitch-lua.install (original) +++ freeswitch/trunk/debian/freeswitch-lua.install Wed Feb 11 06:35:56 2009 @@ -1,2 +1,2 @@ opt/freeswitch/mod/mod_lua* -opt/freeswitch/conf/autoload_configs/lua.conf.xml +etc/freeswitch/autoload_configs/lua.conf.xml Modified: freeswitch/trunk/debian/freeswitch-perl.conffiles ============================================================================== --- freeswitch/trunk/debian/freeswitch-perl.conffiles (original) +++ freeswitch/trunk/debian/freeswitch-perl.conffiles Wed Feb 11 06:35:56 2009 @@ -1 +1 @@ -/opt/freeswitch/conf/autoload_configs/perl.conf.xml +/etc/freeswitch/autoload_configs/perl.conf.xml Modified: freeswitch/trunk/debian/freeswitch-perl.install ============================================================================== --- freeswitch/trunk/debian/freeswitch-perl.install (original) +++ freeswitch/trunk/debian/freeswitch-perl.install Wed Feb 11 06:35:56 2009 @@ -1,3 +1,3 @@ opt/freeswitch/perl/* opt/freeswitch/mod/mod_perl* -opt/freeswitch/conf/autoload_configs/perl.conf.xml +etc/freeswitch/autoload_configs/perl.conf.xml Modified: freeswitch/trunk/debian/freeswitch-spidermonkey.conffiles ============================================================================== --- freeswitch/trunk/debian/freeswitch-spidermonkey.conffiles (original) +++ freeswitch/trunk/debian/freeswitch-spidermonkey.conffiles Wed Feb 11 06:35:56 2009 @@ -1 +1 @@ -/opt/freeswitch/conf/autoload_configs/spidermonkey.conf.xml +/etc/freeswitch/autoload_configs/spidermonkey.conf.xml Modified: freeswitch/trunk/debian/freeswitch-spidermonkey.install ============================================================================== --- freeswitch/trunk/debian/freeswitch-spidermonkey.install (original) +++ freeswitch/trunk/debian/freeswitch-spidermonkey.install Wed Feb 11 06:35:56 2009 @@ -3,4 +3,4 @@ opt/freeswitch/lib/libjs.so* opt/freeswitch/lib/libplds4.so* opt/freeswitch/lib/libplc4.so* -opt/freeswitch/conf/autoload_configs/spidermonkey.conf.xml +etc/freeswitch/autoload_configs/spidermonkey.conf.xml Modified: freeswitch/trunk/debian/freeswitch.conffiles ============================================================================== --- freeswitch/trunk/debian/freeswitch.conffiles (original) +++ freeswitch/trunk/debian/freeswitch.conffiles Wed Feb 11 06:35:56 2009 @@ -1,73 +1,73 @@ -/opt/freeswitch/conf/vars.xml -/opt/freeswitch/conf/mime.types -/opt/freeswitch/conf/web-vm.tpl -/opt/freeswitch/conf/tetris.ttml -/opt/freeswitch/conf/fur_elise.ttml -/opt/freeswitch/conf/voicemail.tpl -/opt/freeswitch/conf/freeswitch.xml -/opt/freeswitch/conf/extensions.conf -/opt/freeswitch/conf/dialplan/public.xml -/opt/freeswitch/conf/dialplan/default.xml -/opt/freeswitch/conf/dialplan/features.xml -/opt/freeswitch/conf/dialplan/default/00_pizza_demo.xml -/opt/freeswitch/conf/dialplan/default/99999_enum.xml -/opt/freeswitch/conf/dialplan/public/00_inbound_did.xml -/opt/freeswitch/conf/sip_profiles/external.xml -/opt/freeswitch/conf/sip_profiles/internal/example.xml -/opt/freeswitch/conf/sip_profiles/internal.xml -/opt/freeswitch/conf/sip_profiles/external/example.xml -/opt/freeswitch/conf/directory/default/1007.xml -/opt/freeswitch/conf/directory/default/1001.xml -/opt/freeswitch/conf/directory/default/1008.xml -/opt/freeswitch/conf/directory/default/1019.xml -/opt/freeswitch/conf/directory/default/1002.xml -/opt/freeswitch/conf/directory/default/1011.xml -/opt/freeswitch/conf/directory/default/1014.xml -/opt/freeswitch/conf/directory/default/1003.xml -/opt/freeswitch/conf/directory/default/brian.xml -/opt/freeswitch/conf/directory/default/1013.xml -/opt/freeswitch/conf/directory/default/1000.xml -/opt/freeswitch/conf/directory/default/1009.xml -/opt/freeswitch/conf/directory/default/1005.xml -/opt/freeswitch/conf/directory/default/1010.xml -/opt/freeswitch/conf/directory/default/1015.xml -/opt/freeswitch/conf/directory/default/1004.xml -/opt/freeswitch/conf/directory/default/1017.xml -/opt/freeswitch/conf/directory/default/default.xml -/opt/freeswitch/conf/directory/default/1018.xml -/opt/freeswitch/conf/directory/default/1006.xml -/opt/freeswitch/conf/directory/default/1016.xml -/opt/freeswitch/conf/directory/default/1012.xml -/opt/freeswitch/conf/directory/default.xml -/opt/freeswitch/conf/autoload_configs/ivr.conf.xml -/opt/freeswitch/conf/autoload_configs/voicemail.conf.xml -/opt/freeswitch/conf/autoload_configs/switch.conf.xml -/opt/freeswitch/conf/autoload_configs/syslog.conf.xml -/opt/freeswitch/conf/autoload_configs/zeroconf.conf.xml -/opt/freeswitch/conf/autoload_configs/alsa.conf.xml -/opt/freeswitch/conf/autoload_configs/portaudio.conf.xml -/opt/freeswitch/conf/autoload_configs/xml_curl.conf.xml -/opt/freeswitch/conf/autoload_configs/enum.conf.xml -/opt/freeswitch/conf/autoload_configs/logfile.conf.xml -/opt/freeswitch/conf/autoload_configs/limit.conf.xml -/opt/freeswitch/conf/autoload_configs/java.conf.xml -/opt/freeswitch/conf/autoload_configs/sofia.conf.xml -/opt/freeswitch/conf/autoload_configs/event_multicast.conf.xml -/opt/freeswitch/conf/autoload_configs/rss.conf.xml -/opt/freeswitch/conf/autoload_configs/xml_rpc.conf.xml -/opt/freeswitch/conf/autoload_configs/local_stream.conf.xml -/opt/freeswitch/conf/autoload_configs/conference.conf.xml -/opt/freeswitch/conf/autoload_configs/event_socket.conf.xml -/opt/freeswitch/conf/autoload_configs/modules.conf.xml -/opt/freeswitch/conf/autoload_configs/dingaling.conf.xml -/opt/freeswitch/conf/autoload_configs/iax.conf.xml -/opt/freeswitch/conf/autoload_configs/post_load_modules.conf.xml -/opt/freeswitch/conf/autoload_configs/pocketsphinx.conf.xml -/opt/freeswitch/conf/autoload_configs/xml_cdr.conf.xml -/opt/freeswitch/conf/autoload_configs/cdr_csv.conf.xml -/opt/freeswitch/conf/autoload_configs/dialplan_directory.conf.xml -/opt/freeswitch/conf/autoload_configs/console.conf.xml -/opt/freeswitch/conf/autoload_configs/timezones.conf.xml -/opt/freeswitch/conf/autoload_configs/fax.conf.xml -/opt/freeswitch/conf/jingle_profiles/server.xml -/opt/freeswitch/conf/jingle_profiles/client.xml +/etc/freeswitch/vars.xml +/etc/freeswitch/mime.types +/etc/freeswitch/web-vm.tpl +/etc/freeswitch/tetris.ttml +/etc/freeswitch/fur_elise.ttml +/etc/freeswitch/voicemail.tpl +/etc/freeswitch/freeswitch.xml +/etc/freeswitch/extensions.conf +/etc/freeswitch/dialplan/public.xml +/etc/freeswitch/dialplan/default.xml +/etc/freeswitch/dialplan/features.xml +/etc/freeswitch/dialplan/default/00_pizza_demo.xml +/etc/freeswitch/dialplan/default/99999_enum.xml +/etc/freeswitch/dialplan/public/00_inbound_did.xml +/etc/freeswitch/sip_profiles/external.xml +/etc/freeswitch/sip_profiles/internal/example.xml +/etc/freeswitch/sip_profiles/internal.xml +/etc/freeswitch/sip_profiles/external/example.xml +/etc/freeswitch/directory/default/1007.xml +/etc/freeswitch/directory/default/1001.xml +/etc/freeswitch/directory/default/1008.xml +/etc/freeswitch/directory/default/1019.xml +/etc/freeswitch/directory/default/1002.xml +/etc/freeswitch/directory/default/1011.xml +/etc/freeswitch/directory/default/1014.xml +/etc/freeswitch/directory/default/1003.xml +/etc/freeswitch/directory/default/brian.xml +/etc/freeswitch/directory/default/1013.xml +/etc/freeswitch/directory/default/1000.xml +/etc/freeswitch/directory/default/1009.xml +/etc/freeswitch/directory/default/1005.xml +/etc/freeswitch/directory/default/1010.xml +/etc/freeswitch/directory/default/1015.xml +/etc/freeswitch/directory/default/1004.xml +/etc/freeswitch/directory/default/1017.xml +/etc/freeswitch/directory/default/default.xml +/etc/freeswitch/directory/default/1018.xml +/etc/freeswitch/directory/default/1006.xml +/etc/freeswitch/directory/default/1016.xml +/etc/freeswitch/directory/default/1012.xml +/etc/freeswitch/directory/default.xml +/etc/freeswitch/autoload_configs/ivr.conf.xml +/etc/freeswitch/autoload_configs/voicemail.conf.xml +/etc/freeswitch/autoload_configs/switch.conf.xml +/etc/freeswitch/autoload_configs/syslog.conf.xml +/etc/freeswitch/autoload_configs/zeroconf.conf.xml +/etc/freeswitch/autoload_configs/alsa.conf.xml +/etc/freeswitch/autoload_configs/portaudio.conf.xml +/etc/freeswitch/autoload_configs/xml_curl.conf.xml +/etc/freeswitch/autoload_configs/enum.conf.xml +/etc/freeswitch/autoload_configs/logfile.conf.xml +/etc/freeswitch/autoload_configs/limit.conf.xml +/etc/freeswitch/autoload_configs/java.conf.xml +/etc/freeswitch/autoload_configs/sofia.conf.xml +/etc/freeswitch/autoload_configs/event_multicast.conf.xml +/etc/freeswitch/autoload_configs/rss.conf.xml +/etc/freeswitch/autoload_configs/xml_rpc.conf.xml +/etc/freeswitch/autoload_configs/local_stream.conf.xml +/etc/freeswitch/autoload_configs/conference.conf.xml +/etc/freeswitch/autoload_configs/event_socket.conf.xml +/etc/freeswitch/autoload_configs/modules.conf.xml +/etc/freeswitch/autoload_configs/dingaling.conf.xml +/etc/freeswitch/autoload_configs/iax.conf.xml +/etc/freeswitch/autoload_configs/post_load_modules.conf.xml +/etc/freeswitch/autoload_configs/pocketsphinx.conf.xml +/etc/freeswitch/autoload_configs/xml_cdr.conf.xml +/etc/freeswitch/autoload_configs/cdr_csv.conf.xml +/etc/freeswitch/autoload_configs/dialplan_directory.conf.xml +/etc/freeswitch/autoload_configs/console.conf.xml +/etc/freeswitch/autoload_configs/timezones.conf.xml +/etc/freeswitch/autoload_configs/fax.conf.xml +/etc/freeswitch/jingle_profiles/server.xml +/etc/freeswitch/jingle_profiles/client.xml Modified: freeswitch/trunk/debian/freeswitch.install ============================================================================== --- freeswitch/trunk/debian/freeswitch.install (original) +++ freeswitch/trunk/debian/freeswitch.install Wed Feb 11 06:35:56 2009 @@ -45,76 +45,76 @@ opt/freeswitch/mod/mod_tone_stream.so* opt/freeswitch/mod/mod_fax.so* opt/freeswitch/mod/mod_loopback.so* -opt/freeswitch/conf/vars.xml -opt/freeswitch/conf/mime.types -opt/freeswitch/conf/web-vm.tpl -opt/freeswitch/conf/tetris.ttml -opt/freeswitch/conf/fur_elise.ttml -opt/freeswitch/conf/dialplan/public.xml -opt/freeswitch/conf/dialplan/default.xml -opt/freeswitch/conf/dialplan/features.xml -opt/freeswitch/conf/dialplan/default/00_pizza_demo.xml -opt/freeswitch/conf/dialplan/default/99999_enum.xml -opt/freeswitch/conf/dialplan/public/00_inbound_did.xml -opt/freeswitch/conf/sip_profiles/external.xml -opt/freeswitch/conf/sip_profiles/internal/example.xml -opt/freeswitch/conf/sip_profiles/internal.xml -opt/freeswitch/conf/sip_profiles/external/example.xml -opt/freeswitch/conf/directory/default/1007.xml -opt/freeswitch/conf/directory/default/1001.xml -opt/freeswitch/conf/directory/default/1008.xml -opt/freeswitch/conf/directory/default/1019.xml -opt/freeswitch/conf/directory/default/1002.xml -opt/freeswitch/conf/directory/default/1011.xml -opt/freeswitch/conf/directory/default/1014.xml -opt/freeswitch/conf/directory/default/1003.xml -opt/freeswitch/conf/directory/default/brian.xml -opt/freeswitch/conf/directory/default/1013.xml -opt/freeswitch/conf/directory/default/1000.xml -opt/freeswitch/conf/directory/default/1009.xml -opt/freeswitch/conf/directory/default/1005.xml -opt/freeswitch/conf/directory/default/1010.xml -opt/freeswitch/conf/directory/default/1015.xml -opt/freeswitch/conf/directory/default/1004.xml -opt/freeswitch/conf/directory/default/1017.xml -opt/freeswitch/conf/directory/default/default.xml -opt/freeswitch/conf/directory/default/1018.xml -opt/freeswitch/conf/directory/default/1006.xml -opt/freeswitch/conf/directory/default/1016.xml -opt/freeswitch/conf/directory/default/1012.xml -opt/freeswitch/conf/directory/default.xml -opt/freeswitch/conf/voicemail.tpl -opt/freeswitch/conf/freeswitch.xml -opt/freeswitch/conf/extensions.conf -opt/freeswitch/conf/autoload_configs/ivr.conf.xml -opt/freeswitch/conf/autoload_configs/voicemail.conf.xml -opt/freeswitch/conf/autoload_configs/switch.conf.xml -opt/freeswitch/conf/autoload_configs/syslog.conf.xml -opt/freeswitch/conf/autoload_configs/zeroconf.conf.xml -opt/freeswitch/conf/autoload_configs/alsa.conf.xml -opt/freeswitch/conf/autoload_configs/portaudio.conf.xml -opt/freeswitch/conf/autoload_configs/xml_curl.conf.xml -opt/freeswitch/conf/autoload_configs/enum.conf.xml -opt/freeswitch/conf/autoload_configs/logfile.conf.xml -opt/freeswitch/conf/autoload_configs/limit.conf.xml -opt/freeswitch/conf/autoload_configs/java.conf.xml -opt/freeswitch/conf/autoload_configs/sofia.conf.xml -opt/freeswitch/conf/autoload_configs/event_multicast.conf.xml -opt/freeswitch/conf/autoload_configs/rss.conf.xml -opt/freeswitch/conf/autoload_configs/xml_rpc.conf.xml -opt/freeswitch/conf/autoload_configs/local_stream.conf.xml -opt/freeswitch/conf/autoload_configs/conference.conf.xml -opt/freeswitch/conf/autoload_configs/event_socket.conf.xml -opt/freeswitch/conf/autoload_configs/modules.conf.xml -opt/freeswitch/conf/autoload_configs/dingaling.conf.xml -opt/freeswitch/conf/autoload_configs/iax.conf.xml -opt/freeswitch/conf/autoload_configs/post_load_modules.conf.xml -opt/freeswitch/conf/autoload_configs/pocketsphinx.conf.xml -opt/freeswitch/conf/autoload_configs/xml_cdr.conf.xml -opt/freeswitch/conf/autoload_configs/cdr_csv.conf.xml -opt/freeswitch/conf/autoload_configs/dialplan_directory.conf.xml -opt/freeswitch/conf/autoload_configs/console.conf.xml -opt/freeswitch/conf/autoload_configs/timezones.conf.xml -opt/freeswitch/conf/autoload_configs/fax.conf.xml -opt/freeswitch/conf/jingle_profiles/server.xml -opt/freeswitch/conf/jingle_profiles/client.xml +etc/freeswitch/vars.xml +etc/freeswitch/mime.types +etc/freeswitch/web-vm.tpl +etc/freeswitch/tetris.ttml +etc/freeswitch/fur_elise.ttml +etc/freeswitch/dialplan/public.xml +etc/freeswitch/dialplan/default.xml +etc/freeswitch/dialplan/features.xml +etc/freeswitch/dialplan/default/00_pizza_demo.xml +etc/freeswitch/dialplan/default/99999_enum.xml +etc/freeswitch/dialplan/public/00_inbound_did.xml +etc/freeswitch/sip_profiles/external.xml +etc/freeswitch/sip_profiles/internal/example.xml +etc/freeswitch/sip_profiles/internal.xml +etc/freeswitch/sip_profiles/external/example.xml +etc/freeswitch/directory/default/1007.xml +etc/freeswitch/directory/default/1001.xml +etc/freeswitch/directory/default/1008.xml +etc/freeswitch/directory/default/1019.xml +etc/freeswitch/directory/default/1002.xml +etc/freeswitch/directory/default/1011.xml +etc/freeswitch/directory/default/1014.xml +etc/freeswitch/directory/default/1003.xml +etc/freeswitch/directory/default/brian.xml +etc/freeswitch/directory/default/1013.xml +etc/freeswitch/directory/default/1000.xml +etc/freeswitch/directory/default/1009.xml +etc/freeswitch/directory/default/1005.xml +etc/freeswitch/directory/default/1010.xml +etc/freeswitch/directory/default/1015.xml +etc/freeswitch/directory/default/1004.xml +etc/freeswitch/directory/default/1017.xml +etc/freeswitch/directory/default/default.xml +etc/freeswitch/directory/default/1018.xml +etc/freeswitch/directory/default/1006.xml +etc/freeswitch/directory/default/1016.xml +etc/freeswitch/directory/default/1012.xml +etc/freeswitch/directory/default.xml +etc/freeswitch/voicemail.tpl +etc/freeswitch/freeswitch.xml +etc/freeswitch/extensions.conf +etc/freeswitch/autoload_configs/ivr.conf.xml +etc/freeswitch/autoload_configs/voicemail.conf.xml +etc/freeswitch/autoload_configs/switch.conf.xml +etc/freeswitch/autoload_configs/syslog.conf.xml +etc/freeswitch/autoload_configs/zeroconf.conf.xml +etc/freeswitch/autoload_configs/alsa.conf.xml +etc/freeswitch/autoload_configs/portaudio.conf.xml +etc/freeswitch/autoload_configs/xml_curl.conf.xml +etc/freeswitch/autoload_configs/enum.conf.xml +etc/freeswitch/autoload_configs/logfile.conf.xml +etc/freeswitch/autoload_configs/limit.conf.xml +etc/freeswitch/autoload_configs/java.conf.xml +etc/freeswitch/autoload_configs/sofia.conf.xml +etc/freeswitch/autoload_configs/event_multicast.conf.xml +etc/freeswitch/autoload_configs/rss.conf.xml +etc/freeswitch/autoload_configs/xml_rpc.conf.xml +etc/freeswitch/autoload_configs/local_stream.conf.xml +etc/freeswitch/autoload_configs/conference.conf.xml +etc/freeswitch/autoload_configs/event_socket.conf.xml +etc/freeswitch/autoload_configs/modules.conf.xml +etc/freeswitch/autoload_configs/dingaling.conf.xml +etc/freeswitch/autoload_configs/iax.conf.xml +etc/freeswitch/autoload_configs/post_load_modules.conf.xml +etc/freeswitch/autoload_configs/pocketsphinx.conf.xml +etc/freeswitch/autoload_configs/xml_cdr.conf.xml +etc/freeswitch/autoload_configs/cdr_csv.conf.xml +etc/freeswitch/autoload_configs/dialplan_directory.conf.xml +etc/freeswitch/autoload_configs/console.conf.xml +etc/freeswitch/autoload_configs/timezones.conf.xml +etc/freeswitch/autoload_configs/fax.conf.xml +etc/freeswitch/jingle_profiles/server.xml +etc/freeswitch/jingle_profiles/client.xml Modified: freeswitch/trunk/debian/postinst ============================================================================== --- freeswitch/trunk/debian/postinst (original) +++ freeswitch/trunk/debian/postinst Wed Feb 11 06:35:56 2009 @@ -25,10 +25,10 @@ adduser --disabled-password --quiet --system \ --home /opt/freeswitch \ --gecos "FreeSwitch Voice Platform" --ingroup daemon \ - --add_extra_groups audio \ freeswitch fi + usermod -a -G audio freeswitch mkdir -p /opt/freeswitch chown -R freeswitch:daemon /opt/freeswitch chmod -R o-rwx /opt/freeswitch Modified: freeswitch/trunk/debian/postrm ============================================================================== --- freeswitch/trunk/debian/postrm (original) +++ freeswitch/trunk/debian/postrm Wed Feb 11 06:35:56 2009 @@ -20,7 +20,7 @@ case "$1" in purge) - rm -Rf /etc/opt/freeswitch + rm -Rf /etc/freeswitch rm -Rf /opt/freeswitch userdel freeswitch ;; Modified: freeswitch/trunk/debian/rules ============================================================================== --- freeswitch/trunk/debian/rules (original) +++ freeswitch/trunk/debian/rules Wed Feb 11 06:35:56 2009 @@ -61,7 +61,7 @@ touch modules.conf echo $(MODULES) for i in $(MODULES); do echo $$i >> modules.conf; done - ./configure --prefix=/opt/freeswitch --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) ${FEATURES} + ./configure --sysconfdir=/etc/freeswitch --prefix=/opt/freeswitch --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) ${FEATURES} configure: if test ! -f Makefile.in ; then \ @@ -123,7 +123,7 @@ dh_link dh_strip --dbg-package=freeswitch dh_compress - dh_fixperms --exclude /opt/freeswitch/conf + dh_fixperms --exclude /etc/freeswitch dh_installdeb dh_shlibdeps --exclude=/opt/freeswitch dh_gencontrol

1 0

[commit] r11751 - in freeswitch/branches/gmaruzz/mod_skypiax: . configs
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: gmaruzz Date: Wed Feb 11 06:32:35 2009 New Revision: 11751 Log: skypiax: outbound interface automatic selection, Seven Du patch: you can call skypiax/ANY/another_skypename, it will automatically chose first available channel. Modified: freeswitch/branches/gmaruzz/mod_skypiax/configs/default.xml freeswitch/branches/gmaruzz/mod_skypiax/mod_skypiax.c Modified: freeswitch/branches/gmaruzz/mod_skypiax/configs/default.xml ============================================================================== --- freeswitch/branches/gmaruzz/mod_skypiax/configs/default.xml (original) +++ freeswitch/branches/gmaruzz/mod_skypiax/configs/default.xml Wed Feb 11 06:32:35 2009 @@ -266,14 +266,21 @@  <extension name="skypiax"> - <condition field="destination_number" expression="^2908$"> + <condition field="destination_number" expression="^2909$"> <action application="bridge" data="skypiax/skypiax1/echo123"/> </condition> </extension> -  + +  + <extension name="skypiax"> + <condition field="destination_number" expression="^2908$"> + <action application="bridge" data="skypiax/ANY/echo123"/> + </condition> + </extension> +  <extension name="skype_uri"> <condition field="destination_number" expression="^skype/(.*)$"> - <action application="bridge" data="skypiax/skypiax1/$1"/> + <action application="bridge" data="skypiax/ANY/$1"/> </condition> </extension> Modified: freeswitch/branches/gmaruzz/mod_skypiax/mod_skypiax.c ============================================================================== --- freeswitch/branches/gmaruzz/mod_skypiax/mod_skypiax.c (original) +++ freeswitch/branches/gmaruzz/mod_skypiax/mod_skypiax.c Wed Feb 11 06:32:35 2009 @@ -491,8 +491,30 @@ slash = strrchr(interface_name, '/'); *slash = '\0'; - for (i = 0; i < SKYPIAX_MAX_INTERFACES; i++) { + if (strncmp("ANY", interface_name, strlen(interface_name)) == 0) { + DEBUGA_SKYPE("Finding one available skype interface\n", + SKYPIAX_P_LOG); + //find an available one, allowing call like originate skypiax/ANY/another_skypename + + for (i = 0; !found && i < SKYPIAX_MAX_INTERFACES; i++) { + if (strlen(globals.SKYPIAX_INTERFACES[i].name)) { + int skype_state = 0; + + tech_pvt = &globals.SKYPIAX_INTERFACES[i]; + skype_state = tech_pvt->interface_state; + DEBUGA_SKYPE("skype interface: %d, name: %s, state: %d\n", + SKYPIAX_P_LOG, + i, globals.SKYPIAX_INTERFACES[i].name, skype_state); + if (SKYPIAX_STATE_DOWN == skype_state || 0 == skype_state) { + found=1; + break; + } + } + } + } + + for (i = 0; !found && i < SKYPIAX_MAX_INTERFACES; i++) { if (strlen(globals.SKYPIAX_INTERFACES[i].name) && (strncmp

1 0

[commit] r11750 - freeswitch/trunk/conf/autoload_configs
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: brian Date: Wed Feb 11 05:41:28 2009 New Revision: 11750 Log: remove openmrcp from modules.conf.xml Modified: freeswitch/trunk/conf/autoload_configs/modules.conf.xml Modified: freeswitch/trunk/conf/autoload_configs/modules.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/modules.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/modules.conf.xml Wed Feb 11 05:41:28 2009 @@ -91,7 +91,6 @@    -

1 0

[commit] r11749 - freeswitch/trunk/conf/dialplan
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: brian Date: Wed Feb 11 00:14:53 2009 New Revision: 11749 Log: here try this out Modified: freeswitch/trunk/conf/dialplan/default.xml Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Wed Feb 11 00:14:53 2009 @@ -217,7 +217,6 @@ <action application="export" data="dialed_extension=$1"/> </condition> <condition field="${sip_authorized}" expression="^true"> - <action application="set" data="voicemail_authorized=${sip_authorized}"/> <action application="answer"/> <action application="sleep" data="1000"/> <action application="voicemail" data="check default ${domain_name} ${dialed_extension}"/>

1 0

[commit] r11748 - in freeswitch/trunk: . libs/libedit
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: shaneb Date: Wed Feb 11 00:07:46 2009 New Revision: 11748 Log: Adding more output as example. Added libedit cmake Added: freeswitch/trunk/libs/libedit/CMakeLists.txt Modified: freeswitch/trunk/CMakeLists.txt Modified: freeswitch/trunk/CMakeLists.txt ============================================================================== --- freeswitch/trunk/CMakeLists.txt (original) +++ freeswitch/trunk/CMakeLists.txt Wed Feb 11 00:07:46 2009 @@ -1,5 +1,5 @@ # FREESWITCH CMAKE BUILD -# SHANE BURRELL 2008 (supjigator) +# Created by SHANE BURRELL 2009 (supjigator) PROJECT (freeswitch) @@ -70,6 +70,42 @@ check_include_file(pthread.h HAVE_PTHREAD_H) +MESSAGE( STATUS "-------------------------------------------------------------------------------" ) +MESSAGE( STATUS ) +MESSAGE( STATUS "-------------------------------------------------------------------------------" ) +MESSAGE( STATUS ) +# the complete system name, e.g. "Linux-2.4.22", "FreeBSD-5.4-RELEASE" or "Windows 5.1" +MESSAGE( STATUS "CMAKE_SYSTEM: " ${CMAKE_SYSTEM} ) +# the short system name, e.g. "Linux", "FreeBSD" or "Windows" +MESSAGE( STATUS "CMAKE_SYSTEM_NAME: " ${CMAKE_SYSTEM_NAME} ) +# only the version part of CMAKE_SYSTEM +MESSAGE( STATUS "CMAKE_SYSTEM_VERSION: " ${CMAKE_SYSTEM_VERSION} ) +# the processor name (e.g. "Intel(R) Pentium(R) M processor 2.00GHz") +MESSAGE( STATUS "CMAKE_SYSTEM_PROCESSOR: " ${CMAKE_SYSTEM_PROCESSOR} ) +# is TRUE on all UNIX-like OS's, including Apple OS X and CygWin +MESSAGE( STATUS "UNIX: " ${UNIX} ) +# is TRUE on Windows, including CygWin +MESSAGE( STATUS "WIN32: " ${WIN32} ) +# is TRUE on Apple OS X +MESSAGE( STATUS "APPLE: " ${APPLE} ) +# is TRUE when using the MinGW compiler in Windows +MESSAGE( STATUS "MINGW: " ${MINGW} ) +# is TRUE on Windows when using the CygWin version of cmake +MESSAGE( STATUS "CYGWIN: " ${CYGWIN} ) +# is TRUE on Windows when using a Borland compiler +MESSAGE( STATUS "BORLAND: " ${BORLAND} ) +# Microsoft compiler +MESSAGE( STATUS "MSVC: " ${MSVC} ) +MESSAGE( STATUS "MSVC_IDE: " ${MSVC_IDE} ) +MESSAGE( STATUS "MSVC60: " ${MSVC60} ) +MESSAGE( STATUS "MSVC70: " ${MSVC70} ) +MESSAGE( STATUS "MSVC71: " ${MSVC71} ) +MESSAGE( STATUS "MSVC80: " ${MSVC80} ) +MESSAGE( STATUS "CMAKE_COMPILER_2005: " ${CMAKE_COMPILER_2005} ) +MESSAGE( STATUS "-------------------------------------------------------------------------------" ) +MESSAGE( STATUS ) + +# DO THREADS FIND_PACKAGE(Threads) @@ -92,9 +128,9 @@ INCLUDE_DIRECTORIES (${SNDFILE_INCLUDE_DIR}) # DO LIBEDIT -FIND_PACKAGE (Libedit) -LINK_LIBRARIES (${PATH_LIB_EDIT}) -INCLUDE_DIRECTORIES (${PATH_INC_EDIT}) +#FIND_PACKAGE (Libedit) +#LINK_LIBRARIES (${PATH_LIB_EDIT}) +#INCLUDE_DIRECTORIES (${PATH_INC_EDIT}) # DO SRTP LINK_LIBRARIES (${CMAKE_SOURCE_DIR}/libs/srtp/.libs/libcryptomath.a) @@ -130,13 +166,13 @@ #ADD_SUBDIRECTORY(libs/sqlite/) ADD_SUBDIRECTORY(libs/pcre/) ADD_SUBDIRECTORY(libs/stfu/) -#ADD_SUBDIRECTORY(libs/libedit/) +ADD_SUBDIRECTORY(libs/libedit/) ADD_SUBDIRECTORY(libs/srtp/) SET ( freeswitch_SRCS src/switch.c src/include/switch.h) ADD_EXECUTABLE(freeswitch ${freeswitch_SRCS}) -TARGET_LINK_LIBRARIES(freeswitch teletone pcre resample switch_ivr switch_ivr_async switch_core switch_core_asr switch_channel switch_core_io switch_apr switch_utils switch_xml switch_buffer switch_caller switch_buffer switch_config switch_console switch_core_codec switch_core_db switch_core_directory switch_core_event_hook switch_core_file switch_core_hash switch_core_media_bug switch_core_memory switch_core_port_allocator switch_core_rwlock switch_core_session switch_core_speech switch_core_sqldb switch_core_state_machine switch_core_timer switch_dso switch_event switch_ivr_async switch_ivr_bridge switch_ivr_menu switch_ivr_originate switch_ivr_play_say switch_loadable_module switch_log switch_odbc switch_pcm switch_regex switch_resample switch_rtp switch_scheduler switch_stun switch_swig switch_time stfu ${optionalLibs}) +TARGET_LINK_LIBRARIES(freeswitch libedit teletone pcre resample switch_ivr switch_ivr_async switch_core switch_core_asr switch_channel switch_core_io switch_apr switch_utils switch_xml switch_buffer switch_caller switch_buffer switch_config switch_console switch_core_codec switch_core_db switch_core_directory switch_core_event_hook switch_core_file switch_core_hash switch_core_media_bug switch_core_memory switch_core_port_allocator switch_core_rwlock switch_core_session switch_core_speech switch_core_sqldb switch_core_state_machine switch_core_timer switch_dso switch_event switch_ivr_async switch_ivr_bridge switch_ivr_menu switch_ivr_originate switch_ivr_play_say switch_loadable_module switch_log switch_odbc switch_pcm switch_regex switch_resample switch_rtp switch_scheduler switch_stun switch_swig switch_time stfu ${optionalLibs}) Added: freeswitch/trunk/libs/libedit/CMakeLists.txt ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/libedit/CMakeLists.txt Wed Feb 11 00:07:46 2009 @@ -0,0 +1,14 @@ +cmake_minimum_required(VERSION 2.6) + +INCLUDE_DIRECTORIES(include/ ./ src/) + +SET ( libedit_SRCS src/filecomplete.c src/key.c src/parse.h src/refresh.c src/sig.h src/tty.c src/el.c src/filecomplete.h src/key.h src/prompt.c src/refresh.h src/strlcat.c src/tty.h src/el.h src/hist.c src/prompt.h src/search.c src/strlcpy.c src/unvis.c src/chared.c src/el_term.h src/hist.h src/map.c src/read.c src/search.h src/sys.h src/vi.c src/chared.h src/emacs.c src/histedit.h src/map.h src/read.h src/term.c src/vis.c src/common.c src/fgetln.c src/history.c src/parse.c src/readline.c src/sig.c src/tokenizer.c src/vis.h) + +ADD_LIBRARY(libedit STATIC ${libedit_SRCS}) + + + + + + +

1 0

[commit] r11747 - freeswitch/trunk/conf/dialplan
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: brian Date: Tue Feb 10 23:07:56 2009 New Revision: 11747 Log: this makes more sense Modified: freeswitch/trunk/conf/dialplan/default.xml Modified: freeswitch/trunk/conf/dialplan/default.xml ============================================================================== --- freeswitch/trunk/conf/dialplan/default.xml (original) +++ freeswitch/trunk/conf/dialplan/default.xml Tue Feb 10 23:07:56 2009 @@ -216,7 +216,7 @@ <action application="set" data="dialed_extension=$1"/> <action application="export" data="dialed_extension=$1"/> </condition> - <condition field="destination_number" expression="^${caller_id_number}$"> + <condition field="${sip_authorized}" expression="^true"> <action application="set" data="voicemail_authorized=${sip_authorized}"/> <action application="answer"/> <action application="sleep" data="1000"/>

1 0

[commit] r11746 - freeswitch/trunk/src/mod/applications/mod_lcr
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: rupa Date: Tue Feb 10 23:07:37 2009 New Revision: 11746 Log: add API lcr_admin show profiles Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c (original) +++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Tue Feb 10 23:07:37 2009 @@ -35,6 +35,7 @@ #define LCR_SYNTAX "lcr <digits> [<lcr profile>]" +#define LCR_ADMIN_SYNTAX "lcr_admin show profiles" /* SQL Query places */ #define LCR_DIGITS_PLACE 0 @@ -795,9 +796,55 @@ return SWITCH_STATUS_SUCCESS; } +SWITCH_STANDARD_API(dialplan_lcr_admin_function) +{ + char *argv[4] = { 0 }; + int argc; + char *mydata = NULL; + switch_hash_index_t *hi; + void *val; + profile_t *profile; + + if (switch_strlen_zero(cmd)) { + goto usage; + } + + mydata = strdup(cmd); + + if ((argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))))) { + if(argc < 2) { + goto usage; + } + if(!strcasecmp(argv[0], "show") && !strcasecmp(argv[1], "profiles")) { + for (hi = switch_hash_first(NULL, globals.profile_hash); hi; hi = switch_hash_next(hi)) { + switch_hash_this(hi, NULL, NULL, &val); + profile = (profile_t *) val; + + stream->write_function(stream, "Name:\t\t%s\n", profile->name); + stream->write_function(stream, "ID:\t\t%d\n", profile->id); + stream->write_function(stream, "order by:\t%s\n", profile->order_by); + if(!switch_strlen_zero(profile->custom_sql)) { + stream->write_function(stream, "custom sql:\t%s\n", profile->custom_sql); + } + stream->write_function(stream, "\n"); + } + } else { + goto usage; + } + } + switch_safe_free(mydata); + return SWITCH_STATUS_SUCCESS; +usage: + switch_safe_free(mydata); + stream->write_function(stream, "-ERR %s\n", LCR_ADMIN_SYNTAX); + return SWITCH_STATUS_SUCCESS; + +} + SWITCH_MODULE_LOAD_FUNCTION(mod_lcr_load) { switch_api_interface_t *dialplan_lcr_api_interface; + switch_api_interface_t *dialplan_lcr_api_admin_interface; switch_application_interface_t *app_interface; switch_dialplan_interface_t *dp_interface; @@ -830,6 +877,7 @@ }; SWITCH_ADD_API(dialplan_lcr_api_interface, "lcr", "Least Cost Routing Module", dialplan_lcr_function, LCR_SYNTAX); + SWITCH_ADD_API(dialplan_lcr_api_admin_interface, "lcr_admin", "Least Cost Routing Module Admin", dialplan_lcr_admin_function, LCR_ADMIN_SYNTAX); SWITCH_ADD_APP(app_interface, "lcr", "Perform an LCR lookup", "Perform an LCR lookup", lcr_app_function, "<number>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_DIALPLAN(dp_interface, "lcr", lcr_dialplan_hunt);

1 0

[commit] r11745 - freeswitch/trunk/src/mod/applications/mod_lcr
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: rupa Date: Tue Feb 10 20:55:17 2009 New Revision: 11745 Log: initialize retval Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Modified: freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c (original) +++ freeswitch/trunk/src/mod/applications/mod_lcr/mod_lcr.c Tue Feb 10 20:55:17 2009 @@ -241,7 +241,7 @@ { char * tsql; tsql = switch_mprintf(sql, "5555551212"); - switch_bool_t retval; + switch_bool_t retval = SWITCH_FALSE; if (globals.odbc_dsn) { if(switch_odbc_handle_exec(globals.master_odbc, tsql, NULL)

1 0

[commit] r11744 - freeswitch/trunk/cmake_modules
by FreeSWITCH SVN 11 Feb '09

11 Feb '09

Author: shaneb Date: Tue Feb 10 20:53:31 2009 New Revision: 11744 Log: Initial CMAKE file commit Added: freeswitch/trunk/cmake_modules/ freeswitch/trunk/cmake_modules/FindAPR.cmake freeswitch/trunk/cmake_modules/FindAPRUtil.cmake freeswitch/trunk/cmake_modules/FindLibedit.cmake freeswitch/trunk/cmake_modules/FindSndfile.cmake Added: freeswitch/trunk/cmake_modules/FindAPR.cmake ============================================================================== --- (empty file) +++ freeswitch/trunk/cmake_modules/FindAPR.cmake Tue Feb 10 20:53:31 2009 @@ -0,0 +1,51 @@ +# Locate APR include paths and libraries + +# This module defines +# APR_INCLUDES, where to find apr.h, etc. +# APR_LIBS, the libraries to link against to use APR. +# APR_FLAGS, the flags to use to compile +# APR_DEFINITIONS, definitions to use when compiling code that uses APR. +# APR_FOUND, set to 'yes' if found + +find_program(APR_CONFIG_EXECUTABLE + apr-1-config + /usr/local/apr/1.2.12/bin + /usr/local/bin + /usr/bin + C:/Progra~1/apr/bin + ) + +mark_as_advanced(APR_CONFIG_EXECUTABLE) + +macro(_apr_invoke _varname _regexp) + execute_process( + COMMAND ${APR_CONFIG_EXECUTABLE} ${ARGN} + OUTPUT_VARIABLE _apr_output + RESULT_VARIABLE _apr_failed + ) + + if(_apr_failed) + message(FATAL_ERROR "apr-1-config ${ARGN} failed") + else(_apr_failed) + string(REGEX REPLACE "[\r\n]" "" _apr_output "${_apr_output}") + string(REGEX REPLACE " +$" "" _apr_output "${_apr_output}") + + if(NOT ${_regexp} STREQUAL "") + string(REGEX REPLACE "${_regexp}" " " _apr_output "${_apr_output}") + endif(NOT ${_regexp} STREQUAL "") + + separate_arguments(_apr_output) + set(${_varname} "${_apr_output}") + endif(_apr_failed) +endmacro(_apr_invoke) + +_apr_invoke(APR_INCLUDES "(^| )-I" --includes) +_apr_invoke(APR_FLAGS --cppflags --cflags) +_apr_invoke(APR_EXTRALIBS "(^| )-l" --libs) +_apr_invoke(APR_LIBS "" --link-ld) + +if(APR_INCLUDES AND APR_EXTRALIBS AND APR_LIBS) + set(APR_FOUND "YES") + message (STATUS "apr found: YES ${APR_LIBS}") +endif(APR_INCLUDES AND APR_EXTRALIBS AND APR_LIBS) + Added: freeswitch/trunk/cmake_modules/FindAPRUtil.cmake ============================================================================== --- (empty file) +++ freeswitch/trunk/cmake_modules/FindAPRUtil.cmake Tue Feb 10 20:53:31 2009 @@ -0,0 +1,49 @@ +# Locate APR-Util include paths and libraries + +# This module defines +# APRUTIL_INCLUDES, where to find apr.h, etc. +# APRUTIL_LIBS, the libraries to link against to use APR. +# APRUTIL_FOUND, set to yes if found + +find_program(APRUTIL_CONFIG_EXECUTABLE + apu-1-config + /usr/local/apr-util/1.2.12/bin + /usr/local/bin + /usr/bin + C:/Progra~1/apr/bin + ) + +mark_as_advanced(APRUTIL_CONFIG_EXECUTABLE) + +macro(_apu_invoke _varname _regexp) + execute_process( + COMMAND ${APRUTIL_CONFIG_EXECUTABLE} ${ARGN} + OUTPUT_VARIABLE _apr_output + RESULT_VARIABLE _apr_failed + ) + + if(_apr_failed) + message(FATAL_ERROR "apu-1-config ${ARGN} failed") + else(_apr_failed) + string(REGEX REPLACE "[\r\n]" "" _apr_output "${_apr_output}") + string(REGEX REPLACE " +$" "" _apr_output "${_apr_output}") + + if(NOT ${_regexp} STREQUAL "") + string(REGEX REPLACE "${_regexp}" " " _apr_output "${_apr_output}") + endif(NOT ${_regexp} STREQUAL "") + + separate_arguments(_apr_output) + + set(${_varname} "${_apr_output}") + endif(_apr_failed) +endmacro(_apu_invoke) + +_apu_invoke(APRUTIL_INCLUDES "(^| )-I" --includes) +_apu_invoke(APRUTIL_LIBS "" --link-ld) + +if(APRUTIL_LIBS AND APRUTIL_INCLUDES) + set(APRUTIL_FOUND "YES") + set(APRUTIL_DEFINITIONS "") + message (STATUS "apr-util found: YES ${APRUTIL_LIBS}") +endif(APRUTIL_LIBS AND APRUTIL_INCLUDES) + Added: freeswitch/trunk/cmake_modules/FindLibedit.cmake ============================================================================== --- (empty file) +++ freeswitch/trunk/cmake_modules/FindLibedit.cmake Tue Feb 10 20:53:31 2009 @@ -0,0 +1,15 @@ + +find_path(PATH_INC_EDIT NAMES "histedit.h" PATHS ${CMAKE_SOURCE_DIR}/libs/libedit/src/) + +if( NOT PATH_INC_EDIT ) + message(FATAL_ERROR"Unable to locate libedit include files" ) +endif( NOT PATH_INC_EDIT ) + +find_library(PATH_LIB_EDIT NAMES "libedit.a" PATHS ${CMAKE_SOURCE_DIR}/libs/libedit/src/.libs/) + +if( NOT PATH_LIB_EDIT ) + message(FATAL_ERROR "Unable to locate libedit library file" ) +endif( NOT PATH_LIB_EDIT ) + +MESSAGE( STATUS "PATH_INC_EDIT = \"${PATH_INC_EDIT}\"" ) +MESSAGE( STATUS "PATH_LIB_EDIT = \"${PATH_LIB_EDIT}\"" ) Added: freeswitch/trunk/cmake_modules/FindSndfile.cmake ============================================================================== --- (empty file) +++ freeswitch/trunk/cmake_modules/FindSndfile.cmake Tue Feb 10 20:53:31 2009 @@ -0,0 +1,34 @@ +# - Find sndfile +# Find the native sndfile includes and libraries +# +# SNDFILE_INCLUDE_DIR - where to find sndfile.h, etc. +# SNDFILE_LIBRARIES - List of libraries when using libsndfile. +# SNDFILE_FOUND - True if libsndfile found. + +if(SNDFILE_INCLUDE_DIR) + # Already in cache, be silent + set(SNDFILE_FIND_QUIETLY TRUE) +endif(SNDFILE_INCLUDE_DIR) + +FIND_PATH(SNDFILE_INCLUDE_DIR NAMES sndfile.h PATHS ${CMAKE_SOURCE_DIR}/libs/libsndfile/src/) + +FIND_LIBRARY(SNDFILE_LIBRARY NAMES libsndfile.a PATHS ${CMAKE_SOURCE_DIR}/libs/libsndfile/src/.libs/) + +MESSAGE( STATUS "SNDFILE_INCLUDE_DIR = \"${SNDFILE_INCLUDE_DIR}\"" ) +MESSAGE( STATUS "SNDFILE_LIBRARY = \"${SNDFILE_LIBRARY}\"" ) + +# Handle the QUIETLY and REQUIRED arguments and set SNDFILE_FOUND to TRUE if +# all listed variables are TRUE. +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(SNDFILE DEFAULT_MSG + SNDFILE_INCLUDE_DIR SNDFILE_LIBRARY) + +if(SNDFILE_FOUND) + set(SNDFILE_LIBRARIES ${SNDFILE_LIBRARY}) +else(SNDFILE_FOUND) + set(SNDFILE_LIBRARIES) +endif(SNDFILE_FOUND) + +mark_as_advanced(SNDFILE_INCLUDE_DIR SNDFILE_LIBRARY) +MESSAGE( STATUS "SNDFILE_INCLUDE_DIR = \"${SNDFILE_INCLUDE_DIR}\"" ) +MESSAGE( STATUS "SNDFILE_LIBRARY = \"${SNDFILE_LIBRARY}\"" )

1 0