This patch has not been fully applied to the github project, the src/display.cpp part has been left out, making the program now fail to compile. Please see https://github.com/fenrus75/powertop/commit/152a39949691d34e1c6d67272f3b6... -- Anthony On Wed, 12 Feb 2020 at 06:16, Joe Konno <joe.konno(a)linux.intel.com&gt; wrote: > > From: Joe Konno <joe.konno(a)intel.com&gt; > > This doesn't work as well as I thought it would. So, let's remove it. As > a result of the revert, remove a reference to a now-dead preprocessor > define (PACKAGE_SHORT_VERSION). > > This reverts commit 2daaaf54d07340610af759cc7f4c41742abb3277. > > Signed-off-by: Joe Konno <joe.konno(a)intel.com&gt; > --- > .gitignore | 1 - > Makefile.am | 2 -- > autogen.sh | 1 - > configure.ac | 5 +---- > scripts/version | 13 ------------- > src/display.cpp | 2 +- > 6 files changed, 2 insertions(+), 22 deletions(-) > delete mode 100644 scripts/version > > diff --git a/.gitignore b/.gitignore > index 8358ca4c6c0f..c1fc2be37afe 100644 > --- a/.gitignore > +++ b/.gitignore > @@ -89,5 +89,4 @@ Makefile.in > /src/powertop > /stamp-h1 > /stamp-po > -/version* > tags > diff --git a/Makefile.am b/Makefile.am > index ffb5e91b2834..22429e0ce562 100644 > --- a/Makefile.am > +++ b/Makefile.am > @@ -15,6 +15,4 @@ EXTRA_DIST = \ > TODO \ > Android.mk \ > COPYING \ > - version-long \ > - version-short \ > autogen.sh > diff --git a/autogen.sh b/autogen.sh > index 444f9998f806..e210037d70e0 100755 > --- a/autogen.sh > +++ b/autogen.sh > @@ -1,4 +1,3 @@ > #!/bin/sh > > -sh scripts/version > autoreconf --install --verbose > diff --git a/configure.ac b/configure.ac > index ca7f1d5cefea..b3a6b2ca2639 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -2,8 +2,7 @@ > # Process this file with autoconf to produce a configure script. > > AC_PREREQ([2.68]) > -AC_INIT([powertop], m4_esyscmd_s([cat version-long]), > - [powertop(a)lists.01.org], [], [https://01.org/powertop]) > +AC_INIT([powertop], [2.12-pre], [powertop(a)lists.01.org], [], [https://01.org/powertop]) > AM_INIT_AUTOMAKE([ > -Wall > 1.12.2 > @@ -152,8 +151,6 @@ AC_SEARCH_LIBS([inet_aton], [resolv], [], [ > AC_MSG_ERROR([libresolv is required but was not found]) > ], []) > > -AC_DEFINE([PACKAGE_SHORT_VERSION], m4_esyscmd_s([cat version-short]), > - [Short package version]) > > AS_IF([`pkg-config --exists bash-completion`], [ > bashcompletiondir=`pkg-config --variable=completionsdir --define-variable=prefix=${prefix} bash-completion` > diff --git a/scripts/version b/scripts/version > deleted file mode 100644 > index 348b13d9f785..000000000000 > --- a/scripts/version > +++ /dev/null > @@ -1,13 +0,0 @@ > -#!/bin/sh > - > -git branch > /dev/null 2>&1 > -if [ "$?" = "0" ]; then > - LONG=$(git describe --abbrev=7 --tags --always --dirty 2> /dev/null) > - SHORT=\"$(git describe --tags --abbrev=0 2> /dev/null)\" > -else > - LONG="RUN-VERSION-SCRIPT-IN-GIT-REPOSITORY-ONLY" > - SHORT=\"$LONG\" > -fi > - > -echo $LONG > version-long > -echo $SHORT > version-short > diff --git a/src/display.cpp b/src/display.cpp > index 7b3a7a2f2073..71311446728d 100644 > --- a/src/display.cpp > +++ b/src/display.cpp > @@ -117,7 +117,7 @@ void show_tab(unsigned int tab) > > wattrset(tab_bar, A_REVERSE); > mvwprintw(tab_bar, 0,0, "%120s", ""); > - mvwprintw(tab_bar, 0,0, "PowerTOP %s", PACKAGE_SHORT_VERSION); > + mvwprintw(tab_bar, 0,0, "PowerTOP %s", PACKAGE_VERSION); > > bottom_line = newwin(1, 0, LINES-1, 0); > wattrset(bottom_line, A_REVERSE); > -- > 2.25.0 > _______________________________________________ > PowerTop mailing list -- powertop(a)lists.01.org > To unsubscribe send an email to powertop-leave(a)lists.01.org

Yeah, I agree > > -- > Anthony > > On Thu, 2 Apr 2020 at 13:55, Anthony Wong <yp(a)anthonywong.net&gt; wrote: > > > > This patch has not been fully applied to the github project, the > > src/display.cpp part has been left out, making the program now fail to > > compile. > > Please see > > > https://github.com/fenrus75/powertop/commit/152a39949691d34e1c6d672 > 72f > > 3b63cbbe61bf81 > > > > -- > > Anthony > > > > On Wed, 12 Feb 2020 at 06:16, Joe Konno <joe.konno(a)linux.intel.com&gt; > wrote: > > > > > > From: Joe Konno <joe.konno(a)intel.com&gt; > > > > > > This doesn't work as well as I thought it would. So, let's remove > > > it. As a result of the revert, remove a reference to a now-dead > > > preprocessor define (PACKAGE_SHORT_VERSION). > > > > > > This reverts commit 2daaaf54d07340610af759cc7f4c41742abb3277. > > > > > > Signed-off-by: Joe Konno <joe.konno(a)intel.com&gt; > > > --- > > > .gitignore | 1 - > > > Makefile.am | 2 -- > > > autogen.sh | 1 - > > > configure.ac | 5 +---- > > > scripts/version | 13 ------------- > > > src/display.cpp | 2 +- > > > 6 files changed, 2 insertions(+), 22 deletions(-) delete mode > > > 100644 scripts/version > > > > > > diff --git a/.gitignore b/.gitignore index > > > 8358ca4c6c0f..c1fc2be37afe 100644 > > > --- a/.gitignore > > > +++ b/.gitignore > > > @@ -89,5 +89,4 @@ Makefile.in > > > /src/powertop > > > /stamp-h1 > > > /stamp-po > > > -/version* > > > tags > > > diff --git a/Makefile.am b/Makefile.am index > > > ffb5e91b2834..22429e0ce562 100644 > > > --- a/Makefile.am > > > +++ b/Makefile.am > > > @@ -15,6 +15,4 @@ EXTRA_DIST = \ > > > TODO \ > > > Android.mk \ > > > COPYING \ > > > - version-long \ > > > - version-short \ > > > autogen.sh > > > diff --git a/autogen.sh b/autogen.sh index > > > 444f9998f806..e210037d70e0 100755 > > > --- a/autogen.sh > > > +++ b/autogen.sh > > > @@ -1,4 +1,3 @@ > > > #!/bin/sh > > > > > > -sh scripts/version > > > autoreconf --install --verbose > > > diff --git a/configure.ac b/configure.ac index > > > ca7f1d5cefea..b3a6b2ca2639 100644 > > > --- a/configure.ac > > > +++ b/configure.ac > > > @@ -2,8 +2,7 @@ > > > # Process this file with autoconf to produce a configure script. > > > > > > AC_PREREQ([2.68]) > > > -AC_INIT([powertop], m4_esyscmd_s([cat version-long]), > > > - [powertop(a)lists.01.org], [], [https://01.org/powertop]) > > > +AC_INIT([powertop], [2.12-pre], [powertop(a)lists.01.org], [], > > > +[https://01.org/powertop]) > > > AM_INIT_AUTOMAKE([ > > > -Wall > > > 1.12.2 > > > @@ -152,8 +151,6 @@ AC_SEARCH_LIBS([inet_aton], [resolv], [], [ > > > AC_MSG_ERROR([libresolv is required but was not found]) ], > > > []) > > > > > > -AC_DEFINE([PACKAGE_SHORT_VERSION], m4_esyscmd_s([cat version- > short]), > > > - [Short package version]) > > > > > > AS_IF([`pkg-config --exists bash-completion`], [ > > > bashcompletiondir=`pkg-config --variable=completionsdir > > > --define-variable=prefix=${prefix} bash-completion` diff --git > > > a/scripts/version b/scripts/version deleted file mode 100644 index > > > 348b13d9f785..000000000000 > > > --- a/scripts/version > > > +++ /dev/null > > > @@ -1,13 +0,0 @@ > > > -#!/bin/sh > > > - > > > -git branch > /dev/null 2>&1 > > > -if [ "$?" = "0" ]; then > > > - LONG=$(git describe --abbrev=7 --tags --always --dirty 2> /dev/null) > > > - SHORT=\"$(git describe --tags --abbrev=0 2> /dev/null)\" > > > -else > > > - LONG="RUN-VERSION-SCRIPT-IN-GIT-REPOSITORY-ONLY" > > > - SHORT=\"$LONG\" > > > -fi > > > - > > > -echo $LONG > version-long > > > -echo $SHORT > version-short > > > diff --git a/src/display.cpp b/src/display.cpp index > > > 7b3a7a2f2073..71311446728d 100644 > > > --- a/src/display.cpp > > > +++ b/src/display.cpp > > > @@ -117,7 +117,7 @@ void show_tab(unsigned int tab) > > > > > > wattrset(tab_bar, A_REVERSE); > > > mvwprintw(tab_bar, 0,0, "%120s", ""); > > > - mvwprintw(tab_bar, 0,0, "PowerTOP %s", > PACKAGE_SHORT_VERSION); > > > + mvwprintw(tab_bar, 0,0, "PowerTOP %s", PACKAGE_VERSION); > > > > > > bottom_line = newwin(1, 0, LINES-1, 0); > > > wattrset(bottom_line, A_REVERSE); > > > -- > > > 2.25.0 > > > _______________________________________________ > > > PowerTop mailing list -- powertop(a)lists.01.org To unsubscribe send > > > an email to powertop-leave(a)lists.01.org > _______________________________________________ > PowerTop mailing list -- powertop(a)lists.01.org To unsubscribe send an email > to powertop-leave(a)lists.01.org

Sorry for the noise, the patch that Joe sent was not applied cleanly but his patch does take care of the src/display.cpp [1] part [1]https://lists.01.org/hyperkitty/list/powertop@lists.01.org/thread/S5YD6... > > > > > -- > > Anthony > > > > On Wed, 12 Feb 2020 at 06:16, Joe Konno <joe.konno(a)linux.intel.com&gt; > > wrote: > > > > > > From: Joe Konno <joe.konno(a)intel.com&gt; > > > > > > This doesn't work as well as I thought it would. So, let's remove it. > > > As a result of the revert, remove a reference to a now-dead > > > preprocessor define (PACKAGE_SHORT_VERSION). > > > > > > This reverts commit 2daaaf54d07340610af759cc7f4c41742abb3277. > > > > > > Signed-off-by: Joe Konno <joe.konno(a)intel.com&gt; > > > --- > > > .gitignore | 1 - > > > Makefile.am | 2 -- > > > autogen.sh | 1 - > > > configure.ac | 5 +---- > > > scripts/version | 13 ------------- > > > src/display.cpp | 2 +- > > > 6 files changed, 2 insertions(+), 22 deletions(-) delete mode > > > 100644 scripts/version > > > > > > diff --git a/.gitignore b/.gitignore index > > > 8358ca4c6c0f..c1fc2be37afe 100644 > > > --- a/.gitignore > > > +++ b/.gitignore > > > @@ -89,5 +89,4 @@ Makefile.in > > > /src/powertop > > > /stamp-h1 > > > /stamp-po > > > -/version* > > > tags > > > diff --git a/Makefile.am b/Makefile.am index > > > ffb5e91b2834..22429e0ce562 100644 > > > --- a/Makefile.am > > > +++ b/Makefile.am > > > @@ -15,6 +15,4 @@ EXTRA_DIST = \ > > > TODO \ > > > Android.mk \ > > > COPYING \ > > > - version-long \ > > > - version-short \ > > > autogen.sh > > > diff --git a/autogen.sh b/autogen.sh index > > > 444f9998f806..e210037d70e0 100755 > > > --- a/autogen.sh > > > +++ b/autogen.sh > > > @@ -1,4 +1,3 @@ > > > #!/bin/sh > > > > > > -sh scripts/version > > > autoreconf --install --verbose > > > diff --git a/configure.ac b/configure.ac index > > > ca7f1d5cefea..b3a6b2ca2639 100644 > > > --- a/configure.ac > > > +++ b/configure.ac > > > @@ -2,8 +2,7 @@ > > > # Process this file with autoconf to produce a configure script. > > > > > > AC_PREREQ([2.68]) > > > -AC_INIT([powertop], m4_esyscmd_s([cat version-long]), > > > - [powertop(a)lists.01.org], [], [https://01.org/powertop]) > > > +AC_INIT([powertop], [2.12-pre], [powertop(a)lists.01.org], [], > > > +[https://01.org/powertop]) > > > AM_INIT_AUTOMAKE([ > > > -Wall > > > 1.12.2 > > > @@ -152,8 +151,6 @@ AC_SEARCH_LIBS([inet_aton], [resolv], [], [ > > > AC_MSG_ERROR([libresolv is required but was not found]) ], > > > []) > > > > > > -AC_DEFINE([PACKAGE_SHORT_VERSION], m4_esyscmd_s([cat version- > > short]), > > > - [Short package version]) > > > > > > AS_IF([`pkg-config --exists bash-completion`], [ > > > bashcompletiondir=`pkg-config --variable=completionsdir > > > --define-variable=prefix=${prefix} bash-completion` diff --git > > > a/scripts/version b/scripts/version deleted file mode 100644 index > > > 348b13d9f785..000000000000 > > > --- a/scripts/version > > > +++ /dev/null > > > @@ -1,13 +0,0 @@ > > > -#!/bin/sh > > > - > > > -git branch > /dev/null 2>&1 > > > -if [ "$?" = "0" ]; then > > > - LONG=$(git describe --abbrev=7 --tags --always --dirty 2> /dev/null) > > > - SHORT=\"$(git describe --tags --abbrev=0 2> /dev/null)\" > > > -else > > > - LONG="RUN-VERSION-SCRIPT-IN-GIT-REPOSITORY-ONLY" > > > - SHORT=\"$LONG\" > > > -fi > > > - > > > -echo $LONG > version-long > > > -echo $SHORT > version-short > > > diff --git a/src/display.cpp b/src/display.cpp index > > > 7b3a7a2f2073..71311446728d 100644 > > > --- a/src/display.cpp > > > +++ b/src/display.cpp > > > @@ -117,7 +117,7 @@ void show_tab(unsigned int tab) > > > > > > wattrset(tab_bar, A_REVERSE); > > > mvwprintw(tab_bar, 0,0, "%120s", ""); > > > - mvwprintw(tab_bar, 0,0, "PowerTOP %s", > > PACKAGE_SHORT_VERSION); > > > + mvwprintw(tab_bar, 0,0, "PowerTOP %s", PACKAGE_VERSION); > > > > > > bottom_line = newwin(1, 0, LINES-1, 0); > > > wattrset(bottom_line, A_REVERSE); > > > -- > > > 2.25.0 > > > _______________________________________________ > > > PowerTop mailing list -- powertop(a)lists.01.org To unsubscribe send > > > an email to powertop-leave(a)lists.01.org > > _______________________________________________ > > PowerTop mailing list -- powertop(a)lists.01.org To unsubscribe send an > > email to powertop-leave(a)lists.01.org > _______________________________________________ > PowerTop mailing list -- powertop(a)lists.01.org To unsubscribe send an email > to powertop-leave(a)lists.01.org

From: Joe Konno <joe.konno(a)intel.com&gt; Autoconf released 2.69 almost 8 years ago, so let's move the required version up. And since we're moving up to 2.69, we can now assume a sufficiently fresh autoconf-archive package on the host, containing ax_cxx_compile_stdcxx and ax_pthread. Signed-off-by: Joe Konno <joe.konno(a)intel.com&gt; --- configure.ac | 2 +- m4/ax_cxx_compile_stdcxx_11.m4 | 142 -------------- m4/ax_pthread.m4 | 332 --------------------------------- 3 files changed, 1 insertion(+), 475 deletions(-) delete mode 100644 m4/ax_cxx_compile_stdcxx_11.m4 delete mode 100644 m4/ax_pthread.m4 diff --git a/configure.ac b/configure.ac index b3a6b2ca2639..0f9cbd2e8625 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_PREREQ([2.68]) +AC_PREREQ([2.69]) AC_INIT([powertop], [2.12-pre], [powertop(a)lists.01.org], [], [https://01.org/powertop]) AM_INIT_AUTOMAKE([ -Wall diff --git a/m4/ax_cxx_compile_stdcxx_11.m4 b/m4/ax_cxx_compile_stdcxx_11.m4 deleted file mode 100644 index 163a4c646f76..000000000000 --- a/m4/ax_cxx_compile_stdcxx_11.m4 +++ /dev/null @@ -1,142 +0,0 @@ -# ============================================================================ -# http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx_11.html -# ============================================================================ -# -# SYNOPSIS -# -# AX_CXX_COMPILE_STDCXX_11([ext|noext],[mandatory|optional]) -# -# DESCRIPTION -# -# Check for baseline language coverage in the compiler for the C++11 -# standard; if necessary, add switches to CXXFLAGS to enable support. -# -# The first argument, if specified, indicates whether you insist on an -# extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g. -# -std=c++11). If neither is specified, you get whatever works, with -# preference for an extended mode. -# -# The second argument, if specified 'mandatory' or if left unspecified, -# indicates that baseline C++11 support is required and that the macro -# should error out if no mode with that support is found. If specified -# 'optional', then configuration proceeds regardless, after defining -# HAVE_CXX11 if and only if a supporting mode is found. -# -# LICENSE -# -# Copyright (c) 2008 Benjamin Kosnik <bkoz(a)redhat.com&gt; -# Copyright (c) 2012 Zack Weinberg <zackw(a)panix.com&gt; -# Copyright (c) 2013 Roy Stogner <roystgnr(a)ices.utexas.edu&gt; -# Copyright (c) 2014 Alexey Sokolov <sokolov(a)google.com&gt; -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. This file is offered as-is, without any -# warranty. - -#serial 4 - -m4_define([_AX_CXX_COMPILE_STDCXX_11_testbody], [[ - template <typename T> - struct check - { - static_assert(sizeof(int) <= sizeof(T), "not big enough"); - }; - - struct Base { - virtual void f() {} - }; - struct Child : public Base { - virtual void f() override {} - }; - - typedef check<check<bool>> right_angle_brackets; - - int a; - decltype(a) b; - - typedef check<int> check_type; - check_type c; - check_type&& cr = static_cast<check_type&&>(c); - - auto d = a; - auto l = [](){}; -]]) - -AC_DEFUN([AX_CXX_COMPILE_STDCXX_11], [dnl - m4_if([$1], [], [], - [$1], [ext], [], - [$1], [noext], [], - [m4_fatal([invalid argument `$1' to AX_CXX_COMPILE_STDCXX_11])])dnl - m4_if([$2], [], [ax_cxx_compile_cxx11_required=true], - [$2], [mandatory], [ax_cxx_compile_cxx11_required=true], - [$2], [optional], [ax_cxx_compile_cxx11_required=false], - [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX_11])]) - AC_LANG_PUSH([C++])dnl - ac_success=no - AC_CACHE_CHECK(whether $CXX supports C++11 features by default, - ax_cv_cxx_compile_cxx11, - [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])], - [ax_cv_cxx_compile_cxx11=yes], - [ax_cv_cxx_compile_cxx11=no])]) - if test x$ax_cv_cxx_compile_cxx11 = xyes; then - ac_success=yes - fi - - m4_if([$1], [noext], [], [dnl - if test x$ac_success = xno; then - for switch in -std=gnu++11 -std=gnu++0x; do - cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch]) - AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch, - $cachevar, - [ac_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS $switch" - AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])], - [eval $cachevar=yes], - [eval $cachevar=no]) - CXXFLAGS="$ac_save_CXXFLAGS"]) - if eval test x\$$cachevar = xyes; then - CXXFLAGS="$CXXFLAGS $switch" - ac_success=yes - break - fi - done - fi]) - - m4_if([$1], [ext], [], [dnl - if test x$ac_success = xno; then - for switch in -std=c++11 -std=c++0x; do - cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx11_$switch]) - AC_CACHE_CHECK(whether $CXX supports C++11 features with $switch, - $cachevar, - [ac_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS $switch" - AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_11_testbody])], - [eval $cachevar=yes], - [eval $cachevar=no]) - CXXFLAGS="$ac_save_CXXFLAGS"]) - if eval test x\$$cachevar = xyes; then - CXXFLAGS="$CXXFLAGS $switch" - ac_success=yes - break - fi - done - fi]) - AC_LANG_POP([C++]) - if test x$ax_cxx_compile_cxx11_required = xtrue; then - if test x$ac_success = xno; then - AC_MSG_ERROR([*** A compiler with support for C++11 language features is required.]) - fi - else - if test x$ac_success = xno; then - HAVE_CXX11=0 - AC_MSG_NOTICE([No compiler with C++11 support was found]) - else - HAVE_CXX11=1 - AC_DEFINE(HAVE_CXX11,1, - [define if the compiler supports basic C++11 syntax]) - fi - - AC_SUBST(HAVE_CXX11) - fi -]) diff --git a/m4/ax_pthread.m4 b/m4/ax_pthread.m4 deleted file mode 100644 index d383ad5c6d6a..000000000000 --- a/m4/ax_pthread.m4 +++ /dev/null @@ -1,332 +0,0 @@ -# =========================================================================== -# http://www.gnu.org/software/autoconf-archive/ax_pthread.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) -# -# DESCRIPTION -# -# This macro figures out how to build C programs using POSIX threads. It -# sets the PTHREAD_LIBS output variable to the threads library and linker -# flags, and the PTHREAD_CFLAGS output variable to any special C compiler -# flags that are needed. (The user can also force certain compiler -# flags/libs to be tested by setting these environment variables.) -# -# Also sets PTHREAD_CC to any special C compiler that is needed for -# multi-threaded programs (defaults to the value of CC otherwise). (This -# is necessary on AIX to use the special cc_r compiler alias.) -# -# NOTE: You are assumed to not only compile your program with these flags, -# but also link it with them as well. e.g. you should link with -# $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS -# -# If you are only building threads programs, you may wish to use these -# variables in your default LIBS, CFLAGS, and CC: -# -# LIBS="$PTHREAD_LIBS $LIBS" -# CFLAGS="$CFLAGS $PTHREAD_CFLAGS" -# CC="$PTHREAD_CC" -# -# In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant -# has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name -# (e.g. PTHREAD_CREATE_UNDETACHED on AIX). -# -# Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the -# PTHREAD_PRIO_INHERIT symbol is defined when compiling with -# PTHREAD_CFLAGS. -# -# ACTION-IF-FOUND is a list of shell commands to run if a threads library -# is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it -# is not found. If ACTION-IF-FOUND is not specified, the default action -# will define HAVE_PTHREAD. -# -# Please let the authors know if this macro fails on any platform, or if -# you have any other suggestions or comments. This macro was based on work -# by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help -# from M. Frigo), as well as ac_pthread and hb_pthread macros posted by -# Alejandro Forero Cuervo to the autoconf macro repository. We are also -# grateful for the helpful feedback of numerous users. -# -# Updated for Autoconf 2.68 by Daniel Richard G. -# -# LICENSE -# -# Copyright (c) 2008 Steven G. Johnson <stevenj(a)alum.mit.edu&gt; -# Copyright (c) 2011 Daniel Richard G. <skunk(a)iSKUNK.ORG&gt; -# -# This program is free software: you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the -# Free Software Foundation, either version 3 of the License, or (at your -# option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -# Public License for more details. -# -# You should have received a copy of the GNU General Public License along -# with this program. If not, see <http://www.gnu.org/licenses/>;. -# -# As a special exception, the respective Autoconf Macro's copyright owner -# gives unlimited permission to copy, distribute and modify the configure -# scripts that are the output of Autoconf when processing the Macro. You -# need not follow the terms of the GNU General Public License when using -# or distributing such scripts, even though portions of the text of the -# Macro appear in them. The GNU General Public License (GPL) does govern -# all other use of the material that constitutes the Autoconf Macro. -# -# This special exception to the GPL applies to versions of the Autoconf -# Macro released by the Autoconf Archive. When you make and distribute a -# modified version of the Autoconf Macro, you may extend this special -# exception to the GPL to apply to your modified version as well. - -#serial 21 - -AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD]) -AC_DEFUN([AX_PTHREAD], [ -AC_REQUIRE([AC_CANONICAL_HOST]) -AC_LANG_PUSH([C]) -ax_pthread_ok=no - -# We used to check for pthread.h first, but this fails if pthread.h -# requires special compiler flags (e.g. on True64 or Sequent). -# It gets checked for in the link test anyway. - -# First of all, check if the user has set any of the PTHREAD_LIBS, -# etcetera environment variables, and if threads linking works using -# them: -if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - save_LIBS="$LIBS" - LIBS="$PTHREAD_LIBS $LIBS" - AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS]) - AC_TRY_LINK_FUNC([pthread_join], [ax_pthread_ok=yes]) - AC_MSG_RESULT([$ax_pthread_ok]) - if test x"$ax_pthread_ok" = xno; then - PTHREAD_LIBS="" - PTHREAD_CFLAGS="" - fi - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" -fi - -# We must check for the threads library under a number of different -# names; the ordering is very important because some systems -# (e.g. DEC) have both -lpthread and -lpthreads, where one of the -# libraries is broken (non-POSIX). - -# Create a list of thread flags to try. Items starting with a "-" are -# C compiler flags, and other items are library names, except for "none" -# which indicates that we try without any flags at all, and "pthread-config" -# which is a program returning the flags for the Pth emulation library. - -ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" - -# The ordering *is* (sometimes) important. Some notes on the -# individual items follow: - -# pthreads: AIX (must check this before -lpthread) -# none: in case threads are in libc; should be tried before -Kthread and -# other compiler flags to prevent continual compiler warnings -# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) -# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) -# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) -# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads) -# -pthreads: Solaris/gcc -# -mthreads: Mingw32/gcc, Lynx/gcc -# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it -# doesn't hurt to check since this sometimes defines pthreads too; -# also defines -D_REENTRANT) -# ... -mt is also the pthreads flag for HP/aCC -# pthread: Linux, etcetera -# --thread-safe: KAI C++ -# pthread-config: use pthread-config program (for GNU Pth library) - -case ${host_os} in - solaris*) - - # On Solaris (at least, for some versions), libc contains stubbed - # (non-functional) versions of the pthreads routines, so link-based - # tests will erroneously succeed. (We need to link with -pthreads/-mt/ - # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather - # a function called by this macro, so we could check for that, but - # who knows whether they'll stub that too in a future libc.) So, - # we'll just look for -pthreads and -lpthread first: - - ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags" - ;; - - darwin*) - ax_pthread_flags="-pthread $ax_pthread_flags" - ;; -esac - -# Clang doesn't consider unrecognized options an error unless we specify -# -Werror. We throw in some extra Clang-specific options to ensure that -# this doesn't happen for GCC, which also accepts -Werror. - -AC_MSG_CHECKING([if compiler needs -Werror to reject unknown flags]) -save_CFLAGS="$CFLAGS" -ax_pthread_extra_flags="-Werror" -CFLAGS="$CFLAGS $ax_pthread_extra_flags -Wunknown-warning-option -Wsizeof-array-argument" -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([int foo(void);],[foo()])], - [AC_MSG_RESULT([yes])], - [ax_pthread_extra_flags= - AC_MSG_RESULT([no])]) -CFLAGS="$save_CFLAGS" - -if test x"$ax_pthread_ok" = xno; then -for flag in $ax_pthread_flags; do - - case $flag in - none) - AC_MSG_CHECKING([whether pthreads work without any flags]) - ;; - - -*) - AC_MSG_CHECKING([whether pthreads work with $flag]) - PTHREAD_CFLAGS="$flag" - ;; - - pthread-config) - AC_CHECK_PROG([ax_pthread_config], [pthread-config], [yes], [no]) - if test x"$ax_pthread_config" = xno; then continue; fi - PTHREAD_CFLAGS="`pthread-config --cflags`" - PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" - ;; - - *) - AC_MSG_CHECKING([for the pthreads library -l$flag]) - PTHREAD_LIBS="-l$flag" - ;; - esac - - save_LIBS="$LIBS" - save_CFLAGS="$CFLAGS" - LIBS="$PTHREAD_LIBS $LIBS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS $ax_pthread_extra_flags" - - # Check for various functions. We must include pthread.h, - # since some functions may be macros. (On the Sequent, we - # need a special flag -Kthread to make this header compile.) - # We check for pthread_join because it is in -lpthread on IRIX - # while pthread_create is in libc. We check for pthread_attr_init - # due to DEC craziness with -lpthreads. We check for - # pthread_cleanup_push because it is one of the few pthread - # functions on Solaris that doesn't have a non-functional libc stub. - # We try pthread_create on general principles. - AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h> - static void routine(void *a) { a = 0; } - static void *start_routine(void *a) { return a; }], - [pthread_t th; pthread_attr_t attr; - pthread_create(&th, 0, start_routine, 0); - pthread_join(th, 0); - pthread_attr_init(&attr); - pthread_cleanup_push(routine, 0); - pthread_cleanup_pop(0) /* ; */])], - [ax_pthread_ok=yes], - []) - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - - AC_MSG_RESULT([$ax_pthread_ok]) - if test "x$ax_pthread_ok" = xyes; then - break; - fi - - PTHREAD_LIBS="" - PTHREAD_CFLAGS="" -done -fi - -# Various other checks: -if test "x$ax_pthread_ok" = xyes; then - save_LIBS="$LIBS" - LIBS="$PTHREAD_LIBS $LIBS" - save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - - # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. - AC_MSG_CHECKING([for joinable pthread attribute]) - attr_name=unknown - for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do - AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>], - [int attr = $attr; return attr /* ; */])], - [attr_name=$attr; break], - []) - done - AC_MSG_RESULT([$attr_name]) - if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then - AC_DEFINE_UNQUOTED([PTHREAD_CREATE_JOINABLE], [$attr_name], - [Define to necessary symbol if this constant - uses a non-standard name on your system.]) - fi - - AC_MSG_CHECKING([if more special flags are required for pthreads]) - flag=no - case ${host_os} in - aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";; - osf* | hpux*) flag="-D_REENTRANT";; - solaris*) - if test "$GCC" = "yes"; then - flag="-D_REENTRANT" - else - # TODO: What about Clang on Solaris? - flag="-mt -D_REENTRANT" - fi - ;; - esac - AC_MSG_RESULT([$flag]) - if test "x$flag" != xno; then - PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" - fi - - AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT], - [ax_cv_PTHREAD_PRIO_INHERIT], [ - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pthread.h>]], - [[int i = PTHREAD_PRIO_INHERIT;]])], - [ax_cv_PTHREAD_PRIO_INHERIT=yes], - [ax_cv_PTHREAD_PRIO_INHERIT=no]) - ]) - AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"], - [AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], [1], [Have PTHREAD_PRIO_INHERIT.])]) - - LIBS="$save_LIBS" - CFLAGS="$save_CFLAGS" - - # More AIX lossage: compile with *_r variant - if test "x$GCC" != xyes; then - case $host_os in - aix*) - AS_CASE(["x/$CC"], - [x*/c89|x*/c89_128|x*/c99|x*/c99_128|x*/cc|x*/cc128|x*/xlc|x*/xlc_v6|x*/xlc128|x*/xlc128_v6], - [#handle absolute path differently from PATH based program lookup - AS_CASE(["x$CC"], - [x/*], - [AS_IF([AS_EXECUTABLE_P([${CC}_r])],[PTHREAD_CC="${CC}_r"])], - [AC_CHECK_PROGS([PTHREAD_CC],[${CC}_r],[$CC])])]) - ;; - esac - fi -fi - -test -n "$PTHREAD_CC" || PTHREAD_CC="$CC" - -AC_SUBST([PTHREAD_LIBS]) -AC_SUBST([PTHREAD_CFLAGS]) -AC_SUBST([PTHREAD_CC]) - -# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: -if test x"$ax_pthread_ok" = xyes; then - ifelse([$1],,[AC_DEFINE([HAVE_PTHREAD],[1],[Define if you have POSIX threads libraries and header files.])],[$1]) - : -else - ax_pthread_ok=no - $2 -fi -AC_LANG_POP -])dnl AX_PTHREAD -- 2.25.0