From 5cd8fb8db0a1478f826ae9a85e2223d032584cd0 Mon Sep 17 00:00:00 2001 From: Stefan Gehn Date: Sat, 23 Aug 2014 18:28:54 +0200 Subject: [PATCH] Fix configure script in cross compile environments Do not try to execute generated executables. Altough this is a nice idea in theory it breaks on cross compile environments which usually cannot execute binaries of the target platform. --- server/configure | 2 +- src/configure | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server/configure b/server/configure index 4be92dd..2997b57 100755 --- a/server/configure +++ b/server/configure @@ -54,7 +54,7 @@ EOF $CC -c test.c -o test.o 2>& 5 $CC test.o -o test -lsensors 2>& 5 -if [ -x ./test ] && ./test +if [ -x ./test ] then echo 'Defining HAVE_LIBSENSORS' 1>& 5 echo '#define HAVE_LIBSENSORS 1' >> configure.h diff --git a/src/configure b/src/configure index 20197b7..f519869 100755 --- a/src/configure +++ b/src/configure @@ -70,7 +70,7 @@ EOF $CC ${CFLAGS} ${OPENSSL_INCLUDE} -c test.c -o test.o 2>& 5 || true $CC test.o -o test ${LINK_FLAGS} ${OPENSSL_LIBS} 2>& 5 || true -if [ -x ./test ] && ./test +if [ -x ./test ] then echo "Found" echo 'Defining HAVE_SSL' 1>& 5 @@ -125,7 +125,7 @@ EOF ${CC} ${CFLAGS} ${GNUTLS_INCLUDE} -c test.c -o test.o 2>& 5 || true ${CC} test.o -o test ${LINK_FLAGS} ${GNUTLS_LIBS} 2>& 5 || true -if [ -x ./test ] && ./test +if [ -x ./test ] then echo "Found" echo 'Defining HAVE_GNUTLS' 1>& 5 @@ -167,7 +167,7 @@ EOF ${CC} ${CFLAGS} ${PKG_NTLM_INCLUDE} -c test.c -o test.o 2>& 5 || true ${CC} test.o -o test ${LINK_FLAGS} ${PKG_NTLM_LIBS} 2>& 5 || true -if [ -x ./test ] && ./test +if [ -x ./test ] then echo "Found" echo 'Defining HAVE_NTLM' 1>& 5 @@ -217,7 +217,7 @@ EOF ${CC} ${CFLAGS} -c test.c -o test.o 2>& 5 || true ${CC} test.o -o test ${LINK_FLAGS} -lsensors 2>& 5 || true -if [ -x ./test ] && ./test +if [ -x ./test ] then echo "Found" echo 'Defining HAVE_LIBSENSORS' 1>& 5