From 1890cc7d2037b5ea90e67a63b24b377244565322 Mon Sep 17 00:00:00 2001 From: Maxim Mamontov Date: Sun, 28 Sep 2014 18:35:20 +0300 Subject: [PATCH] Proper checks for libs. Conflicts: projects/stargazer/build --- projects/stargazer/build | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/projects/stargazer/build b/projects/stargazer/build index 9518d5dd..519aeb13 100755 --- a/projects/stargazer/build +++ b/projects/stargazer/build @@ -196,8 +196,8 @@ fi rm -f fake printf "Checking for -lexpat... " -printf "int main() { return 0; }\n" > build_check.c -$CC $CFLAGS $LDFLAGS build_check.c -lexpat -o fake > /dev/null 2> /dev/null +printf "#include \nint main() { return 0; }\n" > build_check.c +$CXX $CXXFLAGS $LDFLAGS build_check.c -lexpat -o fake > /dev/null 2> /dev/null if [ $? != 0 ] then CHECK_EXPAT=no @@ -209,7 +209,8 @@ fi rm -f fake printf "Checking for -lfbclient... " -$CC $CFLAGS $LDFLAGS build_check.c -lfbclient $LIB_THREAD -o fake > /dev/null 2> /dev/null +printf "int main() { return 0; }\n" > build_check.c +$CXX $CXXFLAGS $LDFLAGS build_check.c -lfbclient $LIB_THREAD -o fake > /dev/null 2> /dev/null if [ $? != 0 ] then CHECK_FBCLIENT=no @@ -221,12 +222,13 @@ fi rm -f fake printf "Checking for mysql_config... " +printf "#include \nint main() { return 0; }\n" > build_check.c MYSQL_VERSION=`mysql_config --version 2> /dev/null` if [ $? != 0 ] then printf "no\n"; printf "Checking for -lmysqlclient... " - $CC $CFLAGS $LDFLAGS build_check.c -lmysqlclient_r $LIB_THREAD -o fake > /dev/null 2> /dev/null + $CXX $CXXFLAGS $LDFLAGS build_check.c -lmysqlclient_r $LIB_THREAD -o fake > /dev/null 2> /dev/null if [ $? != 0 ] then CHECK_MYSQLCLIENT=no @@ -260,12 +262,13 @@ else fi printf "Checking for pg_config... " +printf "#include \nint main() { return 0; }\n" > build_check.c PG_VERSION=`pg_config --version 2> /dev/null` if [ $? != 0 ] then printf "no\n"; printf "Checking for -lpq... " - $CC $CFLAGS $LDFLAGS build_check.c -lpq $LIB_THREAD -o fake > /dev/null 2> /dev/null + $CXX $CXXFLAGS $LDFLAGS build_check.c -lpq $LIB_THREAD -o fake > /dev/null 2> /dev/null if [ $? != 0 ] then CHECK_PQ=no @@ -299,12 +302,13 @@ else fi printf "Checking for xmlrpc-c-config... " +printf "#include \nint main() { return 0; }\n" > build_check.c XMLRPCC_VERSION=`xmlrpc-c-config $XMLRPC_FEATURES --version 2> /dev/null` if [ $? != 0 ] then printf "no\n"; printf "Checking for -lxmlrpc... " - $CC $CFLAGS $LDFLAGS build_check.c -lxmlrpc $LIB_THREAD -o fake > /dev/null 2> /dev/null + $CXX $CXXFLAGS $LDFLAGS build_check.c -lxmlrpc $LIB_THREAD -o fake > /dev/null 2> /dev/null if [ $? != 0 ] then CHECK_XMLRPC=no @@ -342,7 +346,8 @@ else fi printf "Checking for -lnfnetlink... " -$CC $CFLAGS $LDFLAGS build_check.c -lnfnetlink -o fake > /dev/null 2> /dev/null +printf "#include \nint main() { return 0; }\n" > build_check.c +$CXX $CXXFLAGS $LDFLAGS build_check.c -lnfnetlink -o fake > /dev/null 2> /dev/null if [ $? != 0 ] then CHECK_NFNETLINK=no @@ -354,7 +359,8 @@ fi rm -f fake printf "Checking for -lnetfilter_queue... " -$CC $CFLAGS $LDFLAGS build_check.c -lnetfilter_queue -o fake > /dev/null 2> /dev/null +printf "#include \nint main() { return 0; }\n" > build_check.c +$CXX $CXXFLAGS $LDFLAGS build_check.c -lnetfilter_queue -o fake > /dev/null 2> /dev/null if [ $? != 0 ] then CHECK_NFQ=no @@ -371,7 +377,7 @@ then printf "#include \n" > build_check.c printf "#include \n" >> build_check.c printf "int main() { return 0; }\n" >> build_check.c - $CC $CFLAGS $LDFLAGS build_check.c -lexpat -o fake > /dev/null 2> /dev/null + $CXX $CXXFLAGS $LDFLAGS build_check.c -o fake > /dev/null 2> /dev/null if [ $? != 0 ] then CHECK_IP_QUEUE_H=no @@ -390,7 +396,7 @@ rm -f build_check.c if [ "$CHECK_EXPAT" != "yes" ] then - printf "-lexpat not found!\n" + printf -- "-lexpat not found!\n" exit 1 fi -- 2.44.2