1
0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-07 10:48:06 +00:00

Merge branch 'master' into v1.2.stable

This commit is contained in:
Ken Rice 2013-03-04 10:34:09 -06:00
commit 04e6db24f1

@ -1107,7 +1107,6 @@ AC_CONFIG_FILES([Makefile
libs/xmlrpc-c/config.mk libs/xmlrpc-c/config.mk
libs/xmlrpc-c/srcdir.mk libs/xmlrpc-c/srcdir.mk
libs/xmlrpc-c/stamp-h libs/xmlrpc-c/stamp-h
libs/sipcc/Makefile
scripts/gentls_cert]) scripts/gentls_cert])
AM_CONDITIONAL(ISLINUX, [test `uname -s` = Linux]) AM_CONDITIONAL(ISLINUX, [test `uname -s` = Linux])