From: Alfredo Deza <adeza@redhat.com>
Date: Fri, 9 Sep 2016 19:45:46 +0000 (-0400)
Subject: ceph-dev-setup: call autogen only when not using cmake
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F470%2Fhead;p=ceph-build.git

ceph-dev-setup: call autogen only when not using cmake

Signed-off-by: Alfredo Deza <adeza@redhat.com>
---

diff --git a/ceph-dev-setup/build/build b/ceph-dev-setup/build/build
index 1c9e1a4c..81344dc5 100644
--- a/ceph-dev-setup/build/build
+++ b/ceph-dev-setup/build/build
@@ -64,26 +64,6 @@ then
     FLAVOR_FLAGS="$FLAVOR_FLAGS --with-blkin"
 fi
 
-echo "Running autogen.sh ..."
-./autogen.sh
-echo "Running configure ..."
-./configure \
-  --disable-option-checking \
-  '--prefix=/usr' \
-  '--sbindir=/sbin' \
-  '--localstatedir=/var' \
-  '--sysconfdir=/etc' \
-  '--with-debug' \
-  '--with-nss' \
-  '--with-radosgw' \
-  '--disable-static' \
-  '--without-lttng' \
-  $FLAVOR_FLAGS \
-  'CFLAGS= -Wno-unused-parameter' \
-  'CXXFLAGS=  -Wno-unused-parameter' \
-  --cache-file=/dev/null \
-  --srcdir=.
-
 mkdir -p release
 
 # Contents below used to come from /srv/release_tarball.sh and
@@ -130,6 +110,26 @@ else
       extract_flags="jxf"
       compress_flags="jcf"
     else
+      echo "Running autogen.sh ..."
+      ./autogen.sh
+      echo "Running configure ..."
+      ./configure \
+        --disable-option-checking \
+        '--prefix=/usr' \
+        '--sbindir=/sbin' \
+        '--localstatedir=/var' \
+        '--sysconfdir=/etc' \
+        '--with-debug' \
+        '--with-nss' \
+        '--with-radosgw' \
+        '--disable-static' \
+        '--without-lttng' \
+        $FLAVOR_FLAGS \
+        'CFLAGS= -Wno-unused-parameter' \
+        'CXXFLAGS=  -Wno-unused-parameter' \
+        --cache-file=/dev/null \
+        --srcdir=.
+
       make dist
       make dist-bzip2
       vers=`ls ceph-*.tar.gz | cut -c 6- | sed 's/.tar.gz//'`