diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-11-25 17:55:25 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-11-25 17:55:25 +0000 |
| commit | 213cad8e815a5a017a1fe2b254b5c041ea830d86 (patch) | |
| tree | 789089844ff6e534781e658e6dbc2b4ffe2503e4 /auto/lib | |
| parent | 89d635fa5dd04cb857f00de98f34d7792ec3e1a5 (diff) | |
| download | nginx-213cad8e815a5a017a1fe2b254b5c041ea830d86.tar.gz nginx-213cad8e815a5a017a1fe2b254b5c041ea830d86.tar.bz2 | |
libatomic_ops support
Diffstat (limited to 'auto/lib')
| -rw-r--r-- | auto/lib/conf | 5 | ||||
| -rw-r--r-- | auto/lib/libatomic/conf | 38 | ||||
| -rw-r--r-- | auto/lib/libatomic/make | 13 | ||||
| -rw-r--r-- | auto/lib/make | 4 |
4 files changed, 60 insertions, 0 deletions
diff --git a/auto/lib/conf b/auto/lib/conf index edb15bc3b..60e891b9e 100644 --- a/auto/lib/conf +++ b/auto/lib/conf @@ -70,6 +70,11 @@ fi if [ $HTTP_GEOIP = YES ]; then . auto/lib/geoip/conf fi + if [ $NGX_GOOGLE_PERFTOOLS = YES ]; then . auto/lib/google-perftools/conf fi + +if [ $NGX_LIBATOMIC != NO ]; then + . auto/lib/libatomic/conf +fi diff --git a/auto/lib/libatomic/conf b/auto/lib/libatomic/conf new file mode 100644 index 000000000..a06ab1a88 --- /dev/null +++ b/auto/lib/libatomic/conf @@ -0,0 +1,38 @@ + +# Copyright (C) Igor Sysoev + + +if [ $NGX_LIBATOMIC != YES ]; then + + have=NGX_HAVE_LIBATOMIC . auto/have + CORE_INCS="$CORE_INCS $NGX_LIBATOMIC/src" + LINK_DEPS="$LINK_DEPS $NGX_LIBATOMIC/src/libatomic_ops.a" + CORE_LIBS="$CORE_LIBS $NGX_LIBATOMIC/src/libatomic_ops.a" + +else + + ngx_feature="atomic_ops library" + ngx_feature_name=NGX_HAVE_LIBATOMIC + ngx_feature_run=no + ngx_feature_incs="#include <atomic_ops.h>" + ngx_feature_path= + ngx_feature_libs="-latomic_ops" + ngx_feature_test="AO_t *n; + AO_compare_and_swap(n, 0, 1); + AO_fetch_and_add(n, 1); + AO_nop();" + + . auto/feature + + if [ $ngx_found = yes ]; then + CORE_LIBS="$CORE_LIBS $ngx_feature_libs" + else + +cat << END + +$0: error: libatomic_ops library was not found. + +END + exit 1 + fi +fi diff --git a/auto/lib/libatomic/make b/auto/lib/libatomic/make new file mode 100644 index 000000000..e1672e324 --- /dev/null +++ b/auto/lib/libatomic/make @@ -0,0 +1,13 @@ + +# Copyright (C) Igor Sysoev + + + cat << END >> $NGX_MAKEFILE + +$NGX_LIBATOMIC/src/libatomic_ops.a: $NGX_LIBATOMIC/Makefile + cd $NGX_LIBATOMIC && make + +$NGX_LIBATOMIC/Makefile: $NGX_MAKEFILE + cd $NGX_LIBATOMIC && ./configure + +END diff --git a/auto/lib/make b/auto/lib/make index 170311c63..f22767eb4 100644 --- a/auto/lib/make +++ b/auto/lib/make @@ -22,6 +22,10 @@ if [ $ZLIB != NONE -a $ZLIB != NO -a $ZLIB != YES ]; then . auto/lib/zlib/make fi +if [ $NGX_LIBATOMIC != NO -a $NGX_LIBATOMIC != YES ]; then + . auto/lib/libatomic/make +fi + if [ $USE_PERL = YES ]; then . auto/lib/perl/make fi |