Browse Source

Remove vendored copies of m4 files

These can be consumed directly via gnulib and autoconf-archive
packages these days. (yay!) Remove the copies from the tree and
add gnulib and autoconf-archive to bindep.

As part of doing this, switch to using the autoconf-archive version
of debug flag handling, AX_CHECK_ENABLE_DEBUG.
changes/91/636791/1
Monty Taylor 3 months ago
parent
commit
b1063b17e0
8 changed files with 9 additions and 551 deletions
  1. 4
    2
      bindep.txt
  2. 1
    5
      configure.ac
  3. 0
    66
      m4/ax_assert.m4
  4. 0
    61
      m4/ax_debug.m4
  5. 0
    313
      m4/ax_pthread.m4
  6. 0
    23
      m4/pandora_header_assert.m4
  7. 0
    77
      m4/visibility.m4
  8. 4
    4
      m4/zuul_canonical.m4

+ 4
- 2
bindep.txt View File

@@ -1,8 +1,10 @@
1
-pkg-config [compile test]
2
-build-essential [compile test]
1
+make [compile test]
2
+g++ [compile test]
3 3
 autoconf [compile test]
4 4
 automake [compile test]
5 5
 libtool [compile test]
6
+autoconf-archive [compile test]
7
+gnulib [compile test]
6 8
 gettext [compile test]
7 9
 libcpprest-dev [compile test]
8 10
 libcpprest

+ 1
- 5
configure.ac View File

@@ -29,6 +29,7 @@ AC_CONFIG_AUX_DIR([config])
29 29
 AM_INIT_AUTOMAKE([-Wall -Werror -Wno-portability subdir-objects foreign tar-ustar])
30 30
 AC_PREREQ(2.59)dnl		Minimum Autoconf version required.
31 31
 
32
+AX_CHECK_ENABLE_DEBUG
32 33
 AC_CANONICAL_HOST
33 34
 AC_CANONICAL_BUILD
34 35
 AC_ARG_PROGRAM
@@ -46,11 +47,6 @@ LT_PREREQ([2.4])
46 47
 LT_INIT
47 48
 LT_LANG([C++])
48 49
 
49
-
50
-gl_VISIBILITY
51
-AX_ASSERT
52
-
53
-
54 50
 AS_IF([test "x${pandora_cv_skip_requires}" != "xno"],[
55 51
 
56 52
   AC_ARG_WITH([comment],

+ 0
- 66
m4/ax_assert.m4 View File

@@ -1,66 +0,0 @@
1
-# ===========================================================================
2
-#      https://github.com/BrianAker/ddm4/
3
-# ===========================================================================
4
-#
5
-# SYNOPSIS
6
-#
7
-#   AX_ASSERT()
8
-#
9
-# DESCRIPTION
10
-#
11
-#   --enable-assert
12
-#
13
-# LICENSE
14
-#
15
-#  Copyright (C) 2012 Brian Aker
16
-#  All rights reserved.
17
-#  
18
-#  Redistribution and use in source and binary forms, with or without
19
-#  modification, are permitted provided that the following conditions are
20
-#  met:
21
-#  
22
-#      * Redistributions of source code must retain the above copyright
23
-#  notice, this list of conditions and the following disclaimer.
24
-#  
25
-#      * Redistributions in binary form must reproduce the above
26
-#  copyright notice, this list of conditions and the following disclaimer
27
-#  in the documentation and/or other materials provided with the
28
-#  distribution.
29
-#  
30
-#      * The names of its contributors may not be used to endorse or
31
-#  promote products derived from this software without specific prior
32
-#  written permission.
33
-#  
34
-#  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
35
-#  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
36
-#  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
37
-#  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
38
-#  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
39
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
40
-#  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
41
-#  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
42
-#  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
43
-#  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
44
-#  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
45
-
46
-#serial 6
47
-
48
-AC_DEFUN([AX_ASSERT],
49
-    [AC_PREREQ([2.63])dnl
50
-    AC_REQUIRE([AX_DEBUG])
51
-    AC_REQUIRE([AX_VCS_CHECKOUT])
52
-    AC_ARG_ENABLE([assert],
53
-      [AS_HELP_STRING([--enable-assert],
54
-        [Enable assert, this will be overridden by --enable-debug (yes|no) @<:@default=no@:>@])],
55
-      [ax_enable_assert=yes],
56
-      [ax_enable_assert=no])
57
-
58
-    AS_IF([ test "$ax_enable_assert" = "yes" -o "$ax_enable_debug" = "yes" -o "$ac_cv_vcs_checkout" = "yes" ],
59
-      [ax_enable_assert="yes"],
60
-      [ax_enable_assert="no"
61
-      AC_DEFINE(NDEBUG,[1],[Define to 1 to disable assert'ing code.])])
62
-
63
-    AC_MSG_CHECKING([for assert])
64
-    AC_MSG_RESULT([$ax_enable_assert])
65
-    ])
66
-

+ 0
- 61
m4/ax_debug.m4 View File

@@ -1,61 +0,0 @@
1
-# ===========================================================================
2
-#      https://github.com/BrianAker/ddm4/
3
-# ===========================================================================
4
-#
5
-# SYNOPSIS
6
-#
7
-#   AX_DEBUG()
8
-#
9
-# DESCRIPTION
10
-#
11
-#   --enable-debug
12
-#
13
-# LICENSE
14
-#
15
-#  Copyright (C) 2012 Brian Aker
16
-#  All rights reserved.
17
-#  
18
-#  Redistribution and use in source and binary forms, with or without
19
-#  modification, are permitted provided that the following conditions are
20
-#  met:
21
-#  
22
-#      * Redistributions of source code must retain the above copyright
23
-#  notice, this list of conditions and the following disclaimer.
24
-#  
25
-#      * Redistributions in binary form must reproduce the above
26
-#  copyright notice, this list of conditions and the following disclaimer
27
-#  in the documentation and/or other materials provided with the
28
-#  distribution.
29
-#  
30
-#      * The names of its contributors may not be used to endorse or
31
-#  promote products derived from this software without specific prior
32
-#  written permission.
33
-#  
34
-#  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
35
-#  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
36
-#  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
37
-#  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
38
-#  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
39
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
40
-#  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
41
-#  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
42
-#  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
43
-#  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
44
-#  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
45
-
46
-#serial 5
47
-
48
-AC_DEFUN([AX_DEBUG],
49
-    [AC_PREREQ([2.63])dnl
50
-    AC_ARG_ENABLE([debug],
51
-      [AS_HELP_STRING([--enable-debug],
52
-        [Add debug code/turns off optimizations (yes|no) @<:@default=no@:>@])],
53
-      [ax_enable_debug=yes
54
-      AC_DEFINE([DEBUG],[1],[Define to 1 to enable debugging code.])],
55
-      [ax_enable_debug=no
56
-      AC_SUBST([MCHECK])
57
-      AC_DEFINE([DEBUG],[0],[Define to 1 to enable debugging code.])])
58
-
59
-    AC_MSG_CHECKING([for debug])
60
-    AC_MSG_RESULT([$ax_enable_debug])
61
-    AM_CONDITIONAL([DEBUG],[test "x${ax_enable_debug}" = "xyes"])])

+ 0
- 313
m4/ax_pthread.m4 View File

@@ -1,313 +0,0 @@
1
-# ===========================================================================
2
-#        http://www.gnu.org/software/autoconf-archive/ax_pthread.html
3
-# ===========================================================================
4
-#
5
-# SYNOPSIS
6
-#
7
-#   AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
8
-#
9
-# DESCRIPTION
10
-#
11
-#   This macro figures out how to build C programs using POSIX threads. It
12
-#   sets the PTHREAD_LIBS output variable to the threads library and linker
13
-#   flags, and the PTHREAD_CFLAGS output variable to any special C compiler
14
-#   flags that are needed. (The user can also force certain compiler
15
-#   flags/libs to be tested by setting these environment variables.)
16
-#
17
-#   Also sets PTHREAD_CC to any special C compiler that is needed for
18
-#   multi-threaded programs (defaults to the value of CC otherwise). (This
19
-#   is necessary on AIX to use the special cc_r compiler alias.)
20
-#
21
-#   NOTE: You are assumed to not only compile your program with these flags,
22
-#   but also link it with them as well. e.g. you should link with
23
-#   $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS
24
-#
25
-#   If you are only building threads programs, you may wish to use these
26
-#   variables in your default LIBS, CFLAGS, and CC:
27
-#
28
-#     LIBS="$PTHREAD_LIBS $LIBS"
29
-#     CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
30
-#     CC="$PTHREAD_CC"
31
-#
32
-#   In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant
33
-#   has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name
34
-#   (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
35
-#
36
-#   Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the
37
-#   PTHREAD_PRIO_INHERIT symbol is defined when compiling with
38
-#   PTHREAD_CFLAGS.
39
-#
40
-#   ACTION-IF-FOUND is a list of shell commands to run if a threads library
41
-#   is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it
42
-#   is not found. If ACTION-IF-FOUND is not specified, the default action
43
-#   will define HAVE_PTHREAD.
44
-#
45
-#   Please let the authors know if this macro fails on any platform, or if
46
-#   you have any other suggestions or comments. This macro was based on work
47
-#   by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help
48
-#   from M. Frigo), as well as ac_pthread and hb_pthread macros posted by
49
-#   Alejandro Forero Cuervo to the autoconf macro repository. We are also
50
-#   grateful for the helpful feedback of numerous users.
51
-#
52
-#   Updated for Autoconf 2.68 by Daniel Richard G.
53
-#
54
-# LICENSE
55
-#
56
-#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
57
-#   Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG>
58
-#
59
-#   This program is free software: you can redistribute it and/or modify it
60
-#   under the terms of the GNU General Public License as published by the
61
-#   Free Software Foundation, either version 3 of the License, or (at your
62
-#   option) any later version.
63
-#
64
-#   This program is distributed in the hope that it will be useful, but
65
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
66
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
67
-#   Public License for more details.
68
-#
69
-#   You should have received a copy of the GNU General Public License along
70
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
71
-#
72
-#   As a special exception, the respective Autoconf Macro's copyright owner
73
-#   gives unlimited permission to copy, distribute and modify the configure
74
-#   scripts that are the output of Autoconf when processing the Macro. You
75
-#   need not follow the terms of the GNU General Public License when using
76
-#   or distributing such scripts, even though portions of the text of the
77
-#   Macro appear in them. The GNU General Public License (GPL) does govern
78
-#   all other use of the material that constitutes the Autoconf Macro.
79
-#
80
-#   This special exception to the GPL applies to versions of the Autoconf
81
-#   Macro released by the Autoconf Archive. When you make and distribute a
82
-#   modified version of the Autoconf Macro, you may extend this special
83
-#   exception to the GPL to apply to your modified version as well.
84
-
85
-#serial 19
86
-
87
-AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD])
88
-AC_DEFUN([AX_PTHREAD], [
89
-AC_REQUIRE([AC_CANONICAL_HOST])
90
-AC_LANG_PUSH([C])
91
-ax_pthread_ok=no
92
-
93
-# We used to check for pthread.h first, but this fails if pthread.h
94
-# requires special compiler flags (e.g. on True64 or Sequent).
95
-# It gets checked for in the link test anyway.
96
-
97
-# First of all, check if the user has set any of the PTHREAD_LIBS,
98
-# etcetera environment variables, and if threads linking works using
99
-# them:
100
-if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
101
-        save_CFLAGS="$CFLAGS"
102
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
103
-        save_LIBS="$LIBS"
104
-        LIBS="$PTHREAD_LIBS $LIBS"
105
-        AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
106
-        AC_TRY_LINK_FUNC(pthread_join, ax_pthread_ok=yes)
107
-        AC_MSG_RESULT($ax_pthread_ok)
108
-        if test x"$ax_pthread_ok" = xno; then
109
-                PTHREAD_LIBS=""
110
-                PTHREAD_CFLAGS=""
111
-        fi
112
-        LIBS="$save_LIBS"
113
-        CFLAGS="$save_CFLAGS"
114
-fi
115
-
116
-# We must check for the threads library under a number of different
117
-# names; the ordering is very important because some systems
118
-# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
119
-# libraries is broken (non-POSIX).
120
-
121
-# Create a list of thread flags to try.  Items starting with a "-" are
122
-# C compiler flags, and other items are library names, except for "none"
123
-# which indicates that we try without any flags at all, and "pthread-config"
124
-# which is a program returning the flags for the Pth emulation library.
125
-
126
-ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
127
-
128
-# The ordering *is* (sometimes) important.  Some notes on the
129
-# individual items follow:
130
-
131
-# pthreads: AIX (must check this before -lpthread)
132
-# none: in case threads are in libc; should be tried before -Kthread and
133
-#       other compiler flags to prevent continual compiler warnings
134
-# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
135
-# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
136
-# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
137
-# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
138
-# -pthreads: Solaris/gcc
139
-# -mthreads: Mingw32/gcc, Lynx/gcc
140
-# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
141
-#      doesn't hurt to check since this sometimes defines pthreads too;
142
-#      also defines -D_REENTRANT)
143
-#      ... -mt is also the pthreads flag for HP/aCC
144
-# pthread: Linux, etcetera
145
-# --thread-safe: KAI C++
146
-# pthread-config: use pthread-config program (for GNU Pth library)
147
-
148
-case ${host_os} in
149
-        solaris*)
150
-
151
-        # On Solaris (at least, for some versions), libc contains stubbed
152
-        # (non-functional) versions of the pthreads routines, so link-based
153
-        # tests will erroneously succeed.  (We need to link with -pthreads/-mt/
154
-        # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather
155
-        # a function called by this macro, so we could check for that, but
156
-        # who knows whether they'll stub that too in a future libc.)  So,
157
-        # we'll just look for -pthreads and -lpthread first:
158
-
159
-        ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags"
160
-        ;;
161
-
162
-        darwin12*)
163
-        ax_pthread_flags="$ax_pthread_flags"
164
-        ;;
165
-
166
-        darwin*)
167
-        ax_pthread_flags="-pthread $ax_pthread_flags"
168
-        ;;
169
-esac
170
-
171
-if test x"$ax_pthread_ok" = xno; then
172
-for flag in $ax_pthread_flags; do
173
-
174
-        case $flag in
175
-                none)
176
-                AC_MSG_CHECKING([whether pthreads work without any flags])
177
-                ;;
178
-
179
-                -*)
180
-                AC_MSG_CHECKING([whether pthreads work with $flag])
181
-                PTHREAD_CFLAGS="$flag"
182
-                ;;
183
-
184
-                pthread-config)
185
-                AC_CHECK_PROG(ax_pthread_config, pthread-config, yes, no)
186
-                if test x"$ax_pthread_config" = xno; then continue; fi
187
-                PTHREAD_CFLAGS="`pthread-config --cflags`"
188
-                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
189
-                ;;
190
-
191
-                *)
192
-                AC_MSG_CHECKING([for the pthreads library -l$flag])
193
-                PTHREAD_LIBS="-l$flag"
194
-                ;;
195
-        esac
196
-
197
-        save_LIBS="$LIBS"
198
-        save_CFLAGS="$CFLAGS"
199
-        LIBS="$PTHREAD_LIBS $LIBS"
200
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
201
-
202
-        # Check for various functions.  We must include pthread.h,
203
-        # since some functions may be macros.  (On the Sequent, we
204
-        # need a special flag -Kthread to make this header compile.)
205
-        # We check for pthread_join because it is in -lpthread on IRIX
206
-        # while pthread_create is in libc.  We check for pthread_attr_init
207
-        # due to DEC craziness with -lpthreads.  We check for
208
-        # pthread_cleanup_push because it is one of the few pthread
209
-        # functions on Solaris that doesn't have a non-functional libc stub.
210
-        # We try pthread_create on general principles.
211
-        AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>
212
-                        static void routine(void *a) { a = 0; }
213
-                        static void *start_routine(void *a) { return a; }],
214
-                       [pthread_t th; pthread_attr_t attr;
215
-                        pthread_create(&th, 0, start_routine, 0);
216
-                        pthread_join(th, 0);
217
-                        pthread_attr_init(&attr);
218
-                        pthread_cleanup_push(routine, 0);
219
-                        pthread_cleanup_pop(0) /* ; */])],
220
-                [ax_pthread_ok=yes],
221
-                [])
222
-
223
-        LIBS="$save_LIBS"
224
-        CFLAGS="$save_CFLAGS"
225
-
226
-        AC_MSG_RESULT($ax_pthread_ok)
227
-        if test "x$ax_pthread_ok" = xyes; then
228
-                break;
229
-        fi
230
-
231
-        PTHREAD_LIBS=""
232
-        PTHREAD_CFLAGS=""
233
-done
234
-fi
235
-
236
-# Various other checks:
237
-if test "x$ax_pthread_ok" = xyes; then
238
-        save_LIBS="$LIBS"
239
-        LIBS="$PTHREAD_LIBS $LIBS"
240
-        save_CFLAGS="$CFLAGS"
241
-        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
242
-
243
-        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
244
-        AC_MSG_CHECKING([for joinable pthread attribute])
245
-        attr_name=unknown
246
-        for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
247
-            AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
248
-                           [int attr = $attr; return attr /* ; */])],
249
-                [attr_name=$attr; break],
250
-                [])
251
-        done
252
-        AC_MSG_RESULT($attr_name)
253
-        if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
254
-            AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name,
255
-                               [Define to necessary symbol if this constant
256
-                                uses a non-standard name on your system.])
257
-        fi
258
-
259
-        AC_MSG_CHECKING([if more special flags are required for pthreads])
260
-        flag=no
261
-        case ${host_os} in
262
-            aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";;
263
-            osf* | hpux*) flag="-D_REENTRANT";;
264
-            solaris*)
265
-            if test "$GCC" = "yes"; then
266
-                flag="-D_REENTRANT"
267
-            else
268
-                flag="-mt -D_REENTRANT"
269
-            fi
270
-            ;;
271
-        esac
272
-        AC_MSG_RESULT(${flag})
273
-        if test "x$flag" != xno; then
274
-            PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
275
-        fi
276
-
277
-        AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT],
278
-            ax_cv_PTHREAD_PRIO_INHERIT, [
279
-                AC_LINK_IFELSE([
280
-                    AC_LANG_PROGRAM([[#include <pthread.h>]], [[int i = PTHREAD_PRIO_INHERIT;]])],
281
-                    [ax_cv_PTHREAD_PRIO_INHERIT=yes],
282
-                    [ax_cv_PTHREAD_PRIO_INHERIT=no])
283
-            ])
284
-        AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"],
285
-            AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], 1, [Have PTHREAD_PRIO_INHERIT.]))
286
-
287
-        LIBS="$save_LIBS"
288
-        CFLAGS="$save_CFLAGS"
289
-
290
-        # More AIX lossage: must compile with xlc_r or cc_r
291
-        if test x"$GCC" != xyes; then
292
-          AC_CHECK_PROGS(PTHREAD_CC, xlc_r cc_r, ${CC})
293
-        else
294
-          PTHREAD_CC=$CC
295
-        fi
296
-else
297
-        PTHREAD_CC="$CC"
298
-fi
299
-
300
-AC_SUBST(PTHREAD_LIBS)
301
-AC_SUBST(PTHREAD_CFLAGS)
302
-AC_SUBST(PTHREAD_CC)
303
-
304
-# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
305
-if test x"$ax_pthread_ok" = xyes; then
306
-        ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1])
307
-        :
308
-else
309
-        ax_pthread_ok=no
310
-        $2
311
-fi
312
-AC_LANG_POP
313
-])dnl AX_PTHREAD

+ 0
- 23
m4/pandora_header_assert.m4 View File

@@ -1,23 +0,0 @@
1
-dnl  Copyright (C) 2009 Sun Microsystems, Inc.
2
-dnl This file is free software; Sun Microsystems, Inc.
3
-dnl gives unlimited permission to copy and/or distribute it,
4
-dnl with or without modifications, as long as this notice is preserved.
5
-
6
-dnl PANDORA_HEADER_ASSERT
7
-dnl ----------------
8
-dnl Check whether to enable assertions.
9
-AC_DEFUN([PANDORA_HEADER_ASSERT],
10
-[
11
-  AC_CHECK_HEADERS(assert.h)
12
-  AC_MSG_CHECKING([whether to enable assertions])
13
-  AC_ARG_ENABLE([assert],
14
-    [AS_HELP_STRING([--disable-assert],
15
-       [Turn off assertions])],
16
-    [ac_cv_assert="no"],
17
-    [ac_cv_assert="yes"])
18
-  AC_MSG_RESULT([$ac_cv_assert])
19
-
20
-  AS_IF([test "$ac_cv_assert" = "no"], 
21
-    [AC_DEFINE(NDEBUG, 1, [Define to 1 if assertions should be disabled.])])
22
-])
23
-

+ 0
- 77
m4/visibility.m4 View File

@@ -1,77 +0,0 @@
1
-# visibility.m4 serial 4 (gettext-0.18.2)
2
-dnl Copyright (C) 2005, 2008, 2010-2011 Free Software Foundation, Inc.
3
-dnl This file is free software; the Free Software Foundation
4
-dnl gives unlimited permission to copy and/or distribute it,
5
-dnl with or without modifications, as long as this notice is preserved.
6
-
7
-dnl From Bruno Haible.
8
-
9
-dnl Tests whether the compiler supports the command-line option
10
-dnl -fvisibility=hidden and the function and variable attributes
11
-dnl __attribute__((__visibility__("hidden"))) and
12
-dnl __attribute__((__visibility__("default"))).
13
-dnl Does *not* test for __visibility__("protected") - which has tricky
14
-dnl semantics (see the 'vismain' test in glibc) and does not exist e.g. on
15
-dnl MacOS X.
16
-dnl Does *not* test for __visibility__("internal") - which has processor
17
-dnl dependent semantics.
18
-dnl Does *not* test for #pragma GCC visibility push(hidden) - which is
19
-dnl "really only recommended for legacy code".
20
-dnl Set the variable CFLAG_VISIBILITY.
21
-dnl Defines and sets the variable HAVE_VISIBILITY.
22
-
23
-AC_DEFUN([gl_VISIBILITY],
24
-[
25
-  AC_REQUIRE([AC_PROG_CC])
26
-  CFLAG_VISIBILITY=
27
-  HAVE_VISIBILITY=0
28
-  if test -n "$GCC"; then
29
-    dnl First, check whether -Werror can be added to the command line, or
30
-    dnl whether it leads to an error because of some other option that the
31
-    dnl user has put into $CC $CFLAGS $CPPFLAGS.
32
-    AC_MSG_CHECKING([whether the -Werror option is usable])
33
-    AC_CACHE_VAL([gl_cv_cc_vis_werror], [
34
-      gl_save_CFLAGS="$CFLAGS"
35
-      CFLAGS="$CFLAGS -Werror"
36
-      AC_COMPILE_IFELSE(
37
-        [AC_LANG_PROGRAM([[]], [[]])],
38
-        [gl_cv_cc_vis_werror=yes],
39
-        [gl_cv_cc_vis_werror=no])
40
-      CFLAGS="$gl_save_CFLAGS"])
41
-    AC_MSG_RESULT([$gl_cv_cc_vis_werror])
42
-    dnl Now check whether visibility declarations are supported.
43
-    AC_MSG_CHECKING([for simple visibility declarations])
44
-    AC_CACHE_VAL([gl_cv_cc_visibility], [
45
-      gl_save_CFLAGS="$CFLAGS"
46
-      CFLAGS="$CFLAGS -fvisibility=hidden"
47
-      dnl We use the option -Werror and a function dummyfunc, because on some
48
-      dnl platforms (Cygwin 1.7) the use of -fvisibility triggers a warning
49
-      dnl "visibility attribute not supported in this configuration; ignored"
50
-      dnl at the first function definition in every compilation unit, and we
51
-      dnl don't want to use the option in this case.
52
-      if test $gl_cv_cc_vis_werror = yes; then
53
-        CFLAGS="$CFLAGS -Werror"
54
-      fi
55
-      AC_COMPILE_IFELSE(
56
-        [AC_LANG_PROGRAM(
57
-           [[extern __attribute__((__visibility__("hidden"))) int hiddenvar;
58
-             extern __attribute__((__visibility__("default"))) int exportedvar;
59
-             extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void);
60
-             extern __attribute__((__visibility__("default"))) int exportedfunc (void);
61
-             void dummyfunc (void) {}
62
-           ]],
63
-           [[]])],
64
-        [gl_cv_cc_visibility=yes],
65
-        [gl_cv_cc_visibility=no])
66
-      CFLAGS="$gl_save_CFLAGS"])
67
-    AC_MSG_RESULT([$gl_cv_cc_visibility])
68
-    if test $gl_cv_cc_visibility = yes; then
69
-      CFLAG_VISIBILITY="-fvisibility=hidden"
70
-      HAVE_VISIBILITY=1
71
-    fi
72
-  fi
73
-  AC_SUBST([CFLAG_VISIBILITY])
74
-  AC_SUBST([HAVE_VISIBILITY])
75
-  AC_DEFINE_UNQUOTED([HAVE_VISIBILITY], [$HAVE_VISIBILITY],
76
-    [Define to 1 or 0, depending whether the compiler supports simple visibility declarations.])
77
-])

+ 4
- 4
m4/zuul_canonical.m4 View File

@@ -47,6 +47,9 @@ AC_DEFUN([ZUUL_CANONICAL_TARGET],[
47 47
     ])
48 48
   ])
49 49
 
50
+  AC_REQUIRE([AC_PROG_CC])
51
+  AC_REQUIRE([AC_PROG_CXX])
52
+
50 53
   # We need to prevent canonical target
51 54
   # from injecting -O2 into CFLAGS - but we won't modify anything if we have
52 55
   # set CFLAGS on the command line, since that should take ultimate precedence
@@ -57,7 +60,6 @@ AC_DEFUN([ZUUL_CANONICAL_TARGET],[
57 60
 
58 61
   m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
59 62
 
60
-  AC_REQUIRE([AC_PROG_CC])
61 63
 
62 64
   m4_if(PCT_NO_VC_CHANGELOG,yes,[
63 65
     vc_changelog=no
@@ -75,14 +77,12 @@ AC_DEFUN([ZUUL_CANONICAL_TARGET],[
75 77
     AC_SUBST(PANDORA_RELEASE_VERSION)
76 78
   ])
77 79
 
78
-  AC_REQUIRE([AC_PROG_CXX])
79 80
   AM_PROG_CC_C_O
80 81
   AC_PROG_CC_STDC
82
+  gl_VISIBILITY
81 83
 
82 84
   PANDORA_OPTIMIZE
83 85
 
84
-  PANDORA_HEADER_ASSERT
85
-
86 86
   PANDORA_WARNINGS(PCT_ALL_ARGS)
87 87
 
88 88
   AM_CFLAGS="${AM_CFLAGS} ${CC_WARNINGS} ${CC_PROFILING} ${CC_COVERAGE}"

Loading…
Cancel
Save