diff options
author | Dario Faggioli <raistlin@linux.it> | 2012-07-25 17:39:23 +0100 |
---|---|---|
committer | Dario Faggioli <raistlin@linux.it> | 2012-07-25 17:39:23 +0100 |
commit | 2ea586860dfbafe92140e1264fdc30ff34d0645f (patch) | |
tree | db33af6dbbbae4f91561bf32ec1e9fc81c63d3cc | |
parent | a154ed502d0a30f980a8bd420bc3ec24ae8abf2f (diff) | |
download | xen-2ea586860dfbafe92140e1264fdc30ff34d0645f.tar.gz xen-2ea586860dfbafe92140e1264fdc30ff34d0645f.tar.bz2 xen-2ea586860dfbafe92140e1264fdc30ff34d0645f.zip |
libxl: kill the need for checking and linking to libm
Which was introduced in 7b0dc7f3ddfe. This is because the NUMA
placement heuristic does not need FP arith anymore.
As usual when changing configure.ac, remember to rerun autoconf
after applying this change.
Signed-off-by: Dario Faggioli <dario.faggioli@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
-rw-r--r-- | tools/config.h.in | 3 | ||||
-rwxr-xr-x | tools/configure | 47 | ||||
-rw-r--r-- | tools/configure.ac | 1 | ||||
-rw-r--r-- | tools/libxl/Makefile | 2 |
4 files changed, 1 insertions, 52 deletions
diff --git a/tools/config.h.in b/tools/config.h.in index 87d744b1b5..bc1ed1057b 100644 --- a/tools/config.h.in +++ b/tools/config.h.in @@ -6,9 +6,6 @@ /* Define to 1 if you have the `crypto' library (-lcrypto). */ #undef HAVE_LIBCRYPTO -/* Define to 1 if you have the `m' library (-lm). */ -#undef HAVE_LIBM - /* Define to 1 if you have the `yajl' library (-lyajl). */ #undef HAVE_LIBYAJL diff --git a/tools/configure b/tools/configure index 0da1a1b18c..216faacba2 100755 --- a/tools/configure +++ b/tools/configure @@ -6336,53 +6336,6 @@ else fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for isnan in -lm" >&5 -$as_echo_n "checking for isnan in -lm... " >&6; } -if test "${ac_cv_lib_m_isnan+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lm $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char isnan (); -int -main () -{ -return isnan (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_m_isnan=yes -else - ac_cv_lib_m_isnan=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_isnan" >&5 -$as_echo "$ac_cv_lib_m_isnan" >&6; } -if test "x$ac_cv_lib_m_isnan" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBM 1 -_ACEOF - - LIBS="-lm $LIBS" - -else - as_fn_error $? "Could not find libm" "$LINENO" 5 -fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MD5 in -lcrypto" >&5 $as_echo_n "checking for MD5 in -lcrypto... " >&6; } if test "${ac_cv_lib_crypto_MD5+set}" = set; then : diff --git a/tools/configure.ac b/tools/configure.ac index 59b9aaffb9..2ee825267b 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -137,7 +137,6 @@ AC_CHECK_LIB([lzo2], [lzo1x_decompress], [zlib="$zlib -DHAVE_LZO1X -llzo2"]) AC_SUBST(zlib) AC_CHECK_LIB([aio], [io_setup], [system_aio="y"], [system_aio="n"]) AC_SUBST(system_aio) -AC_CHECK_LIB([m], [isnan], [], [AC_MSG_ERROR([Could not find libm])]) AC_CHECK_LIB([crypto], [MD5], [], [AC_MSG_ERROR([Could not find libcrypto])]) AC_CHECK_LIB([ext2fs], [ext2fs_open2], [libext2fs="y"], [libext2fs="n"]) AC_SUBST(libext2fs) diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 313f05c292..48f352eb4e 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -61,7 +61,7 @@ ifeq ($(BISON),) scanners, please install it an rerun configure) endif -LIBXL_LIBS += -lyajl -lm +LIBXL_LIBS += -lyajl LIBXL_OBJS = flexarray.o libxl.o libxl_create.o libxl_dm.o libxl_pci.o \ libxl_dom.o libxl_exec.o libxl_xshelp.o libxl_device.o \ |