You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by am...@apache.org on 2013/04/27 07:26:53 UTC

git commit: Fix for CentOS autotools problem.

Updated Branches:
  refs/heads/master dba01ebb6 -> 254daf196


Fix for CentOS autotools problem.


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/254daf19
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/254daf19
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/254daf19

Branch: refs/heads/master
Commit: 254daf196f9c182ff6e4dd3a53eb8ab0b31fefe5
Parents: dba01eb
Author: Alan M. Carroll <am...@network-geographics.com>
Authored: Fri Apr 26 22:25:00 2013 -0700
Committer: Alan M. Carroll <am...@network-geographics.com>
Committed: Fri Apr 26 22:26:12 2013 -0700

----------------------------------------------------------------------
 configure.ac |   40 ++++++++++++++++++++--------------------
 1 files changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/254daf19/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 5789276..6e7549a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -423,26 +423,6 @@ AC_ARG_ENABLE([linux-native-aio],
   [enable_linux_native_aio=no]
 )
 
-AS_IF([test "x$enable_linux_native_aio" = "xyes"], [
-  case $host_os in
-    linux*) ;;
-    *) AC_MSG_ERROR([Linux native AIO can only be enabled on Linux systems])
-  esac
-
-  AC_CHECK_HEADERS([libaio.h], [],
-    [AC_MSG_ERROR([Linux native AIO requires libaio.h])]
-  )
-
-  AC_SEARCH_LIBS([io_submit], [aio], [],
-    [AC_MSG_ERROR([Linux native AIO requires libaio])]
-  )
-
-])
-
-AC_MSG_RESULT([$enable_linux_native_aio])
-TS_ARG_ENABLE_VAR([use], [linux_native_aio])
-AC_SUBST(use_linux_native_aio)
-
 # Configure how many stats to allocate for plugins. Default is 512.
 #
 AC_ARG_WITH([max-api-stats],
@@ -1232,6 +1212,26 @@ AS_IF([test "x$enable_posix_cap" != "xno"],
 )
 AC_SUBST(use_posix_cap)
 
+AS_IF([test "x$enable_linux_native_aio" = "xyes"], [
+  case $host_os in
+    linux*) ;;
+    *) AC_MSG_ERROR([Linux native AIO can only be enabled on Linux systems])
+  esac
+
+  AC_CHECK_HEADERS([libaio.h], [],
+    [AC_MSG_ERROR([Linux native AIO requires libaio.h])]
+  )
+
+  AC_SEARCH_LIBS([io_submit], [aio], [],
+    [AC_MSG_ERROR([Linux native AIO requires libaio])]
+  )
+
+])
+
+AC_MSG_RESULT([$enable_linux_native_aio])
+TS_ARG_ENABLE_VAR([use], [linux_native_aio])
+AC_SUBST(use_linux_native_aio)
+
 # Check for hwloc library.
 # If we don't find it, disable checking for header.
 use_hwloc=0


Re: git commit: Fix for CentOS autotools problem.

Posted by James Peach <jp...@apache.org>.
So this was an ordering problem? What was causing it?

On Apr 26, 2013, at 10:26 PM, amc@apache.org wrote:

> Updated Branches:
>  refs/heads/master dba01ebb6 -> 254daf196
> 
> 
> Fix for CentOS autotools problem.
> 
> 
> Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
> Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/254daf19
> Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/254daf19
> Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/254daf19
> 
> Branch: refs/heads/master
> Commit: 254daf196f9c182ff6e4dd3a53eb8ab0b31fefe5
> Parents: dba01eb
> Author: Alan M. Carroll <am...@network-geographics.com>
> Authored: Fri Apr 26 22:25:00 2013 -0700
> Committer: Alan M. Carroll <am...@network-geographics.com>
> Committed: Fri Apr 26 22:26:12 2013 -0700
> 
> ----------------------------------------------------------------------
> configure.ac |   40 ++++++++++++++++++++--------------------
> 1 files changed, 20 insertions(+), 20 deletions(-)
> ----------------------------------------------------------------------
> 
> 
> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/254daf19/configure.ac
> ----------------------------------------------------------------------
> diff --git a/configure.ac b/configure.ac
> index 5789276..6e7549a 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -423,26 +423,6 @@ AC_ARG_ENABLE([linux-native-aio],
>   [enable_linux_native_aio=no]
> )
> 
> -AS_IF([test "x$enable_linux_native_aio" = "xyes"], [
> -  case $host_os in
> -    linux*) ;;
> -    *) AC_MSG_ERROR([Linux native AIO can only be enabled on Linux systems])
> -  esac
> -
> -  AC_CHECK_HEADERS([libaio.h], [],
> -    [AC_MSG_ERROR([Linux native AIO requires libaio.h])]
> -  )
> -
> -  AC_SEARCH_LIBS([io_submit], [aio], [],
> -    [AC_MSG_ERROR([Linux native AIO requires libaio])]
> -  )
> -
> -])
> -
> -AC_MSG_RESULT([$enable_linux_native_aio])
> -TS_ARG_ENABLE_VAR([use], [linux_native_aio])
> -AC_SUBST(use_linux_native_aio)
> -
> # Configure how many stats to allocate for plugins. Default is 512.
> #
> AC_ARG_WITH([max-api-stats],
> @@ -1232,6 +1212,26 @@ AS_IF([test "x$enable_posix_cap" != "xno"],
> )
> AC_SUBST(use_posix_cap)
> 
> +AS_IF([test "x$enable_linux_native_aio" = "xyes"], [
> +  case $host_os in
> +    linux*) ;;
> +    *) AC_MSG_ERROR([Linux native AIO can only be enabled on Linux systems])
> +  esac
> +
> +  AC_CHECK_HEADERS([libaio.h], [],
> +    [AC_MSG_ERROR([Linux native AIO requires libaio.h])]
> +  )
> +
> +  AC_SEARCH_LIBS([io_submit], [aio], [],
> +    [AC_MSG_ERROR([Linux native AIO requires libaio])]
> +  )
> +
> +])
> +
> +AC_MSG_RESULT([$enable_linux_native_aio])
> +TS_ARG_ENABLE_VAR([use], [linux_native_aio])
> +AC_SUBST(use_linux_native_aio)
> +
> # Check for hwloc library.
> # If we don't find it, disable checking for header.
> use_hwloc=0
> 


Re: git commit: Fix for CentOS autotools problem.

Posted by James Peach <jp...@apache.org>.
So this was an ordering problem? What was causing it?

On Apr 26, 2013, at 10:26 PM, amc@apache.org wrote:

> Updated Branches:
>  refs/heads/master dba01ebb6 -> 254daf196
> 
> 
> Fix for CentOS autotools problem.
> 
> 
> Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
> Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/254daf19
> Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/254daf19
> Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/254daf19
> 
> Branch: refs/heads/master
> Commit: 254daf196f9c182ff6e4dd3a53eb8ab0b31fefe5
> Parents: dba01eb
> Author: Alan M. Carroll <am...@network-geographics.com>
> Authored: Fri Apr 26 22:25:00 2013 -0700
> Committer: Alan M. Carroll <am...@network-geographics.com>
> Committed: Fri Apr 26 22:26:12 2013 -0700
> 
> ----------------------------------------------------------------------
> configure.ac |   40 ++++++++++++++++++++--------------------
> 1 files changed, 20 insertions(+), 20 deletions(-)
> ----------------------------------------------------------------------
> 
> 
> http://git-wip-us.apache.org/repos/asf/trafficserver/blob/254daf19/configure.ac
> ----------------------------------------------------------------------
> diff --git a/configure.ac b/configure.ac
> index 5789276..6e7549a 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -423,26 +423,6 @@ AC_ARG_ENABLE([linux-native-aio],
>   [enable_linux_native_aio=no]
> )
> 
> -AS_IF([test "x$enable_linux_native_aio" = "xyes"], [
> -  case $host_os in
> -    linux*) ;;
> -    *) AC_MSG_ERROR([Linux native AIO can only be enabled on Linux systems])
> -  esac
> -
> -  AC_CHECK_HEADERS([libaio.h], [],
> -    [AC_MSG_ERROR([Linux native AIO requires libaio.h])]
> -  )
> -
> -  AC_SEARCH_LIBS([io_submit], [aio], [],
> -    [AC_MSG_ERROR([Linux native AIO requires libaio])]
> -  )
> -
> -])
> -
> -AC_MSG_RESULT([$enable_linux_native_aio])
> -TS_ARG_ENABLE_VAR([use], [linux_native_aio])
> -AC_SUBST(use_linux_native_aio)
> -
> # Configure how many stats to allocate for plugins. Default is 512.
> #
> AC_ARG_WITH([max-api-stats],
> @@ -1232,6 +1212,26 @@ AS_IF([test "x$enable_posix_cap" != "xno"],
> )
> AC_SUBST(use_posix_cap)
> 
> +AS_IF([test "x$enable_linux_native_aio" = "xyes"], [
> +  case $host_os in
> +    linux*) ;;
> +    *) AC_MSG_ERROR([Linux native AIO can only be enabled on Linux systems])
> +  esac
> +
> +  AC_CHECK_HEADERS([libaio.h], [],
> +    [AC_MSG_ERROR([Linux native AIO requires libaio.h])]
> +  )
> +
> +  AC_SEARCH_LIBS([io_submit], [aio], [],
> +    [AC_MSG_ERROR([Linux native AIO requires libaio])]
> +  )
> +
> +])
> +
> +AC_MSG_RESULT([$enable_linux_native_aio])
> +TS_ARG_ENABLE_VAR([use], [linux_native_aio])
> +AC_SUBST(use_linux_native_aio)
> +
> # Check for hwloc library.
> # If we don't find it, disable checking for header.
> use_hwloc=0
>