]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
change configure check order so auto-detected odbc still adds CoreFoundation on OS-X
authorMichael Jerris <mike@jerris.com>
Wed, 4 Feb 2009 02:03:26 +0000 (02:03 +0000)
committerMichael Jerris <mike@jerris.com>
Wed, 4 Feb 2009 02:03:26 +0000 (02:03 +0000)
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11629 d0543943-73ff-0310-b7d9-9358b9ac24b2

configure.in

index aa3db8b10d3f094d0bbeb115a4ef463117018462..618e2a23b288f2801f0463ef24c9bd5ff1b97285 100644 (file)
@@ -186,6 +186,13 @@ fi
 
 AM_CONDITIONAL([WANT_DEBUG],[test "${enable_debug}" = "yes"])
 
+AC_ARG_ENABLE(core-odbc-support,     
+       [AS_HELP_STRING([--enable-core-odbc-support], [Compile with ODBC Support])],,[enable_core_odbc_support="no"])
+AX_LIB_ODBC
+if test "$ac_cv_found_odbc" = "yes" ; then
+  enable_core_odbc_support="yes"
+fi
+
 ESL_LDFLAGS=
 PLATFORM_CORE_DEPLIBS=
 # tweak platform specific flags
@@ -491,8 +498,6 @@ AC_SUBST(GETSOUNDS)
 LIBCURL_CHECK_CONFIG([yes], [7.13.0], [LIBCURL_DEPS=''], [LIBCURL_DEPS='${switch_srcdir}/libs/curl/lib/libcurl.la';LIBCURL='${switch_srcdir}/libs/curl/lib/libcurl.la';LIBCURL_CPPFLAGS='-I${switch_srcdir}/libs/curl/include'])
 AC_SUBST(LIBCURL_DEPS)
 
-AC_ARG_ENABLE(core-odbc-support,     
-       [AS_HELP_STRING([--enable-core-odbc-support], [Compile with ODBC Support])],,[enable_core_odbc_support="no"])
 
 AC_ARG_ENABLE(core-libedit-support,     
        [AS_HELP_STRING([--disable-core-libedit-support], [Compile without libedit Support])], [enable_core_libedit_support="$enableval"], [enable_core_libedit_support="yes"])
@@ -505,10 +510,6 @@ fi
 
 AX_CHECK_JAVA
 
-AX_LIB_ODBC
-if test "$ac_cv_found_odbc" = "yes" ; then
-  enable_core_odbc_support="yes"
-fi
 
 AM_CONDITIONAL([ADD_ODBC],[test "x$enable_core_odbc_support" != "xno"])
 AM_CONDITIONAL([ADD_LIBEDIT],[test "x$enable_core_libedit_support" != "xno"])