revert 04aac8c932ec853145e3efb60014d6f6e4fefafb it causes recursion loop in some...

diff --git a/acinclude.m4 b/acinclude.m4
index aeba17b5c32f54c13dca2d0b15a3475897911c0c..58b5500a804c30ff4c2729db2412842faa46e359 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -6,6 +6,7 @@ m4_include([build/config/ac_gcc_archflag.m4])
 m4_include([build/config/ac_gcc_x86_cpuid.m4])
 m4_include([build/config/ax_lib_mysql.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/odbc.m4])
 m4_include([build/config/sched_setaffinity.m4])

diff --git a/configure.in b/configure.in
index 83d9fa0d176de11d887b48f37ecd9add702311ca..42256e2ddadcfed984eaa18d1ad096793e1bd16b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -412,6 +412,10 @@ 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]))
 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,     
        [AS_HELP_STRING([--enable-core-pgsql-support], [Compile with PGSQL Support])],,[enable_core_pgsql_support="no"])
 AC_ARG_ENABLE(core-pgsql-pkgconfig,