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

Pull out our own libuuid detection 

APR is the only reason we depend on libuuid, so we'll rely on APR's
tools here.

This partially reverts commit f7fb54d0cd.
This commit is contained in:
Travis Cross 2013-11-04 20:30:58 +00:00
parent bf4440d0c3
commit 04aac8c932
3 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
acinclude.m4
View File

@ -6,7 +6,6 @@ m4_include([build/config/ac_gcc_archflag.m4])
m4_include([build/config/ac_gcc_x86_cpuid.m4]) m4_include([build/config/ac_gcc_x86_cpuid.m4])
m4_include([build/config/ax_lib_mysql.m4]) m4_include([build/config/ax_lib_mysql.m4])
m4_include([build/config/ax_check_java.m4]) m4_include([build/config/ax_check_java.m4])
m4_include([build/config/uuid.m4])
m4_include([build/config/erlang.m4]) m4_include([build/config/erlang.m4])
m4_include([build/config/odbc.m4]) m4_include([build/config/odbc.m4])
m4_include([build/config/sched_setaffinity.m4]) m4_include([build/config/sched_setaffinity.m4])

17
build/config/uuid.m4
View File

@ -1,17 +0,0 @@
AC_DEFUN([CHECK_LIBUUID],
[
PKG_CHECK_MODULES([LIBUUID], [uuid >= 1.41.2],
[LIBUUID_FOUND=yes], [LIBUUID_FOUND=no])
if test "$LIBUUID_FOUND" = "no" ; then
PKG_CHECK_MODULES([LIBUUID], [uuid],
[LIBUUID_FOUND=yes], [LIBUUID_FOUND=no])
if test "$LIBUUID_FOUND" = "no" ; then
AC_MSG_WARN([libuuid development package highly recommended!])
else
LIBUUID_INCLUDEDIR=$(pkg-config --variable=includedir uuid)
LIBUUID_CFLAGS+=" -I$LIBUUID_INCLUDEDIR/uuid "
fi
fi
AC_SUBST([LIBUUID_CFLAGS])
AC_SUBST([LIBUUID_LIBS])
])

4
configure.in
View File

@ -412,10 +412,6 @@ if test "x$enable_core_odbc_support" != "xno"; then
AC_CHECK_LIB([odbc], [SQLDisconnect],, AC_MSG_ERROR([no usable libodbc; please install unixodbc devel package or equivalent])) AC_CHECK_LIB([odbc], [SQLDisconnect],, AC_MSG_ERROR([no usable libodbc; please install unixodbc devel package or equivalent]))
fi fi
CHECK_LIBUUID
SWITCH_AM_LDFLAGS="$LIBUUID_LIBS $SWITCH_AM_LDFLAGS"
SWITCH_AM_CFLAGS="$LIBUUID_CFLAGS $SWITCH_AM_CFLAGS"
AC_ARG_ENABLE(core-pgsql-support, AC_ARG_ENABLE(core-pgsql-support,
[AS_HELP_STRING([--enable-core-pgsql-support], [Compile with PGSQL Support])],,[enable_core_pgsql_support="no"]) [AS_HELP_STRING([--enable-core-pgsql-support], [Compile with PGSQL Support])],,[enable_core_pgsql_support="no"])
AC_ARG_ENABLE(core-pgsql-pkgconfig, AC_ARG_ENABLE(core-pgsql-pkgconfig,