From 04aac8c932ec853145e3efb60014d6f6e4fefafb Mon Sep 17 00:00:00 2001 From: Travis Cross Date: Mon, 4 Nov 2013 20:30:58 +0000 Subject: [PATCH] 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 f7fb54d0cd22c361298c772ce025a47f7937631d. --- acinclude.m4 | 1 - build/config/uuid.m4 | 17 ----------------- configure.in | 4 ---- 3 files changed, 22 deletions(-) delete mode 100644 build/config/uuid.m4 diff --git a/acinclude.m4 b/acinclude.m4 index 58b5500a80..aeba17b5c3 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -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/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/build/config/uuid.m4 b/build/config/uuid.m4 deleted file mode 100644 index 7f37c23c66..0000000000 --- a/build/config/uuid.m4 +++ /dev/null @@ -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]) - ]) diff --git a/configure.in b/configure.in index 42256e2dda..83d9fa0d17 100644 --- a/configure.in +++ b/configure.in @@ -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])) 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,