hawq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h...@apache.org
Subject incubator-hawq git commit: HAWQ 726. configure and configure.in are not consistent.
Date Wed, 11 May 2016 01:32:10 GMT
Repository: incubator-hawq
Updated Branches:
  refs/heads/master 3ac393add -> d2dcfd172


HAWQ 726. configure and configure.in are not consistent.


Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/d2dcfd17
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/d2dcfd17
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/d2dcfd17

Branch: refs/heads/master
Commit: d2dcfd1721f1f25bdf4ba0abf15257252b9707e4
Parents: 3ac393a
Author: Paul Guo <paulguo@gmail.com>
Authored: Tue May 10 15:46:30 2016 +0800
Committer: Ruilong Huo <rhuo@pivotal.io>
Committed: Wed May 11 09:32:01 2016 +0800

----------------------------------------------------------------------
 configure    | 136 +++++++++++++++++++++++++-----------------------------
 configure.in |  26 ++++++-----
 2 files changed, 78 insertions(+), 84 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/d2dcfd17/configure
----------------------------------------------------------------------
diff --git a/configure b/configure
index 46008e4..ae9564e 100755
--- a/configure
+++ b/configure
@@ -715,10 +715,10 @@ EGREP
 GREP
 with_rt
 ADDON_DIR
-with_libyarn
-with_libhdfs3
 with_zlib
 with_system_tzdata
+with_libhdfs3
+with_libyarn
 with_openssl
 with_bonjour
 with_ldap
@@ -863,10 +863,10 @@ with_ldap
 with_bonjour
 with_openssl
 with_readline
+with_libyarn
+with_libhdfs3
 with_libedit_preferred
 with_system_tzdata
-with_libhdfs3
-with_libyarn
 with_zlib
 with_rt
 with_gnu_ld
@@ -1551,9 +1551,9 @@ Optional Packages:
   --with-ldap             build with LDAP support
   --with-bonjour          build with Bonjour support
   --with-openssl          build with OpenSSL support
+  --without-readline      do not use GNU Readline nor BSD Libedit for editing
   --without-libyarn       do not build libyarn
   --without-libhdfs3      do not build libhdfs3
-  --without-readline      do not use GNU Readline nor BSD Libedit for editing
   --without-libedit-preferred  Don't prefer BSD Libedit over GNU Readline
   --with-system-tzdata=DIR  use system time zone data in DIR
   --without-zlib          do not use Zlib
@@ -5769,73 +5769,6 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_java" >&5
 $as_echo "$with_java" >&6; }
 
-#
-# Optionally build libhdfs3
-#
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build libhdfs3" >&5
-$as_echo_n "checking whether to build libhdfs3" >&6; }
-
-pgac_args="$pgac_args with_libhdfs3"
-
-
-# Check whether --with-libhdfs3 was given.
-if test "${with_libhdfs3+set}" = set; then :
-  withval=$with_libhdfs3;
-  case $withval in
-    yes)
-      :
-      ;;
-    no)
-      :
-      ;;
-    *)
-      as_fn_error $? "no argument expected for --with-libhdfs3 option" "$LINENO" 5
-      ;;
-  esac
-
-else
-  with_libhdfs3=yes
-
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_libhdfs3" >&5
-$as_echo "$with_libhdfs3" >&6; }
-
-
-#
-# Optionally build libyarn
-#
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build libyarn" >&5
-$as_echo_n "checking whether to build libyarn" >&6; }
-
-pgac_args="$pgac_args with_libyarn"
-
-
-# Check whether --with-libyarn was given.
-if test "${with_libyarn+set}" = set; then :
-  withval=$with_libyarn;
-  case $withval in
-    yes)
-      :
-      ;;
-    no)
-      :
-      ;;
-    *)
-      as_fn_error $? "no argument expected for --with-libyarn option" "$LINENO" 5
-      ;;
-  esac
-
-else
-  with_libyarn=yes
-
-fi
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_libyarn" >&5
-$as_echo "$with_libyarn" >&6; }
-
 
 
 #
@@ -6175,6 +6108,65 @@ $as_echo "$as_me: WARNING: *** Readline does not work on MinGW ---
disabling" >&
   fi
 fi
 
+#
+# libyarn
+#
+
+pgac_args="$pgac_args with_libyarn"
+
+
+# Check whether --with-libyarn was given.
+if test "${with_libyarn+set}" = set; then :
+  withval=$with_libyarn;
+  case $withval in
+    yes)
+      :
+      ;;
+    no)
+      :
+      ;;
+    *)
+      as_fn_error $? "no argument expected for --with-libyarn option" "$LINENO" 5
+      ;;
+  esac
+
+else
+  with_libyarn=yes
+
+fi
+
+
+
+
+#
+# libhdfs3
+#
+
+pgac_args="$pgac_args with_libhdfs3"
+
+
+# Check whether --with-libhdfs3 was given.
+if test "${with_libhdfs3+set}" = set; then :
+  withval=$with_libhdfs3;
+  case $withval in
+    yes)
+      :
+      ;;
+    no)
+      :
+      ;;
+    *)
+      as_fn_error $? "no argument expected for --with-libhdfs3 option" "$LINENO" 5
+      ;;
+  esac
+
+else
+  with_libhdfs3=yes
+
+fi
+
+
+
 
 #
 # Prefer libedit

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/d2dcfd17/configure.in
----------------------------------------------------------------------
diff --git a/configure.in b/configure.in
index f1fdc02..d2459b8 100644
--- a/configure.in
+++ b/configure.in
@@ -224,7 +224,7 @@ AC_SUBST(enable_profiling)
 # --enable-coverage enables generation of code coverage metrics with gcov
 #
 PGAC_ARG_BOOL(enable, coverage, no,
-              [build with coverage testing instrumentation],
+              [  --enable-coverage       build with coverage testing instrumentation],
 [AC_CHECK_PROGS(GCOV, gcov)
 if test -z "$GCOV"; then
   AC_MSG_ERROR([gcov not found])
@@ -844,6 +844,19 @@ if test "$PORTNAME" = "win32"; then
   fi
 fi
 
+#
+# libyarn
+#
+PGAC_ARG_BOOL(with, libyarn, yes,
+              [  --without-libyarn       do not build libyarn])
+AC_SUBST(with_libyarn)
+
+#
+# libhdfs3
+#
+PGAC_ARG_BOOL(with, libhdfs3, yes,
+              [  --without-libhdfs3      do not build libhdfs3])
+AC_SUBST(with_libhdfs3)
 
 #
 # Prefer libedit
@@ -1296,17 +1309,6 @@ AM_PATH_XML2([2.7.6], [], [AC_MSG_ERROR([libxml2 is required])])
 pgac_args="$pgac_args with_xml_prefix with_xml_exec_prefix enable_xmltest"
 CFLAGS="$CFLAGS $XML_CPPFLAGS"
 
-# libhdfs3 
-
-AC_CHECK_HEADERS(hdfs/hdfs.h, [], [AC_MSG_ERROR([libhdfs3 is required])])
-AC_SEARCH_LIBS(hdfsOpenFile, hdfs3, [], [AC_MSG_ERROR([libhdfs3 is required])], [])
-
-
-# libyarn 
-
-AC_CHECK_HEADERS(libyarn/LibYarnClientC.h, [], [AC_MSG_ERROR([libyarn is required])])
-AC_SEARCH_LIBS(newLibYarnClient, yarn, [], [AC_MSG_ERROR([libyarn is required])], [])
-
 # apr for gpfdist
 AC_CHECK_PROG([APR_CONFIG], [apr-1-config],[yes])
 test -z "$APR_CONFIG" && AC_MSG_ERROR([Please install apr from http://apr.apache.org/
and add dir of 'apr-1-config' to env variable '$PATH'.])


Mime
View raw message