From: Ondřej Surý <ondrej@sury.org>
Date: Wed, 13 May 2015 09:50:55 +0000 (+0200)
Subject: First try autotools then cmake
X-Git-Tag: v1.0.0-beta1~173^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76a3487e4b723a64c525ace3f654228af1c7a328;p=thirdparty%2Fknot-resolver.git

First try autotools then cmake
---

diff --git a/scripts/bootstrap-depends.sh b/scripts/bootstrap-depends.sh
index c2eaebce6..4df95363c 100755
--- a/scripts/bootstrap-depends.sh
+++ b/scripts/bootstrap-depends.sh
@@ -46,18 +46,18 @@ function fetch_pkg {
 }
 
 function build_pkg {
-	if [ -f CMakeLists.txt ]; then
-		[ -e cmake-build ] && rm -rf cmake-build; mkdir cmake-build; cd cmake-build
-		cmake -DCMAKE_INSTALL_PREFIX=${PREFIX} ..
-		make ${MAKEOPTS}
-		make install
-	elif [ -f configure.ac ]; then
+	if [ -f configure.ac ]; then
 		if [ ! -e ./configure ]; then
 			[ -e autogen.sh ] && sh autogen.sh || autoreconf -if
 		fi
 		./configure --prefix=${PREFIX} --enable-shared $*
 		make ${MAKEOPTS}
 		make install
+	elif [ -f CMakeLists.txt ]; then
+		[ -e cmake-build ] && rm -rf cmake-build; mkdir cmake-build; cd cmake-build
+		cmake -DCMAKE_INSTALL_PREFIX=${PREFIX} ..
+		make ${MAKEOPTS}
+		make install
 	else
 		make $*
 	fi