Revert revision which disabled the generating of configuration

scripts if cmake is available. We need to always generate the
scripts in order for the dual cmake/autotools support to work.

1 files changed, 15 insertions, 21 deletions

diff --git a/BUILD/autorun.sh b/BUILD/autorun.sh
index 9fdd0486360..f4508ab12b6 100755
--- a/BUILD/autorun.sh
+++ b/BUILD/autorun.sh
@@ -21,24 +21,18 @@ done
 IFS="$save_ifs"
 
 rm -rf configure
-
-# Ensure that cmake and perl are available. Required for cmake based builds.
-cmake -P cmake/check_minimal_version.cmake >/dev/null 2>&1 || HAVE_CMAKE=no
-perl --version >/dev/null 2>&1 || HAVE_CMAKE=no
-
-# Whether to use the autotools configuration script or cmake.
-if test "$HAVE_CMAKE" = "no"
-then
-  aclocal || die "Can't execute aclocal"
-  autoheader || die "Can't execute autoheader"
-  # --force means overwrite ltmain.sh script if it already exists
-  $LIBTOOLIZE --automake --force --copy || die "Can't execute libtoolize"
-  # --add-missing instructs automake to install missing auxiliary files
-  # and --force to overwrite them if they already exist
-  automake --add-missing --force  --copy || die "Can't execute automake"
-  autoconf || die "Can't execute autoconf"
-else
-  path=`dirname $0`
-  cp $path/cmake_configure.sh $path/../configure
-  chmod +x $path/../configure
-fi
+aclocal || die "Can't execute aclocal" 
+autoheader || die "Can't execute autoheader"
+# --force means overwrite ltmain.sh script if it already exists 
+$LIBTOOLIZE --automake --force --copy || die "Can't execute libtoolize"
+  
+# --add-missing instructs automake to install missing auxiliary files
+# and --force to overwrite them if they already exist
+automake --add-missing --force  --copy || die "Can't execute automake"
+autoconf || die "Can't execute autoconf"
+# Do not use autotools generated configure directly. Instead, use a script
+# that will either call CMake or original configure shell script at build
+# time (CMake is preferred if installed).
+mv configure configure.am
+cp BUILD/cmake_configure.sh configure
+chmod a+x configure