Commits
Jyrki Wahlstedt authored 830a08f674f
1 + | --- configure.orig |
2 + | +++ configure |
3 + | |
4 + | |
5 + | } # ac_fn_c_check_header_compile |
6 + | |
7 + | +# ac_fn_c_check_header_preproc LINENO HEADER VAR |
8 + | +# ---------------------------------------------- |
9 + | +# Tests whether HEADER is present, setting the cache variable VAR accordingly. |
10 + | +ac_fn_c_check_header_preproc () |
11 + | +{ |
12 + | + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
13 + | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 |
14 + | +$as_echo_n "checking for $2... " >&6; } |
15 + | +if eval \${$3+:} false; then : |
16 + | + $as_echo_n "(cached) " >&6 |
17 + | +else |
18 + | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
19 + | +/* end confdefs.h. */ |
20 + | +#include <$2> |
21 + | +_ACEOF |
22 + | +if ac_fn_c_try_cpp "$LINENO"; then : |
23 + | + eval "$3=yes" |
24 + | +else |
25 + | + eval "$3=no" |
26 + | +fi |
27 + | +rm -f conftest.err conftest.i conftest.$ac_ext |
28 + | +fi |
29 + | +eval ac_res=\$$3 |
30 + | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 |
31 + | +$as_echo "$ac_res" >&6; } |
32 + | + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno |
33 + | + |
34 + | +} # ac_fn_c_check_header_preproc |
35 + | + |
36 + | # ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES |
37 + | # ---------------------------------------------------- |
38 + | # Tries to find if the field MEMBER exists in type AGGR, after including |
39 + | |
40 + | if test "$with_ossp_uuid" = yes ; then |
41 + | for ac_header in ossp/uuid.h |
42 + | do : |
43 + | - ac_fn_c_check_header_mongrel "$LINENO" "ossp/uuid.h" "ac_cv_header_ossp_uuid_h" "$ac_includes_default" |
44 + | + ac_fn_c_check_header_preproc "$LINENO" "ossp/uuid.h" "ac_cv_header_ossp_uuid_h" |
45 + | if test "x$ac_cv_header_ossp_uuid_h" = xyes; then : |
46 + | cat >>confdefs.h <<_ACEOF |
47 + | #define HAVE_OSSP_UUID_H 1 |
48 + | |
49 + | |
50 + | for ac_header in uuid.h |
51 + | do : |
52 + | - ac_fn_c_check_header_mongrel "$LINENO" "uuid.h" "ac_cv_header_uuid_h" "$ac_includes_default" |
53 + | + ac_fn_c_check_header_preproc "$LINENO" "uuid.h" "ac_cv_header_uuid_h" |
54 + | if test "x$ac_cv_header_uuid_h" = xyes; then : |
55 + | cat >>confdefs.h <<_ACEOF |
56 + | #define HAVE_UUID_H 1 |
57 + | --- configure.in.orig |
58 + | +++ configure.in |
59 + | |
60 + | if test "$with_ossp_uuid" = yes ; then |
61 + | AC_CHECK_HEADERS(ossp/uuid.h, [], [ |
62 + | AC_CHECK_HEADERS(uuid.h, [], |
63 + | - [AC_MSG_ERROR([header file <ossp/uuid.h> or <uuid.h> is required for OSSP-UUID])])]) |
64 + | + [AC_MSG_ERROR([header file <ossp/uuid.h> or <uuid.h> is required for OSSP-UUID])], [-])], [-]) |
65 + | fi |
66 + | |
67 + | if test "$PORTNAME" = "win32" ; then |