Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 654042 | Differences between
and this patch

Collapse All | Expand All

(-)a/m4/libassuan.m4 (-67 / +55 lines)
Lines 1-5 Link Here
1
dnl Autoconf macros for libassuan
1
dnl Autoconf macros for libassuan
2
dnl       Copyright (C) 2002, 2003 Free Software Foundation, Inc.
2
dnl Copyright (C) 2002, 2003, 2011 Free Software Foundation, Inc.
3
dnl
3
dnl
4
dnl This file is free software; as a special exception the author gives
4
dnl This file is free software; as a special exception the author gives
5
dnl unlimited permission to copy and/or distribute it, with or without
5
dnl unlimited permission to copy and/or distribute it, with or without
Lines 14-20 Link Here
14
dnl Returns ok set to yes or no.
14
dnl Returns ok set to yes or no.
15
dnl
15
dnl
16
AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
16
AC_DEFUN([_AM_PATH_LIBASSUAN_COMMON],
17
[ AC_ARG_WITH(libassuan-prefix,
17
[ AC_REQUIRE([AC_CANONICAL_HOST])
18
  AC_ARG_WITH(libassuan-prefix,
18
              AC_HELP_STRING([--with-libassuan-prefix=PFX],
19
              AC_HELP_STRING([--with-libassuan-prefix=PFX],
19
                             [prefix where LIBASSUAN is installed (optional)]),
20
                             [prefix where LIBASSUAN is installed (optional)]),
20
     libassuan_config_prefix="$withval", libassuan_config_prefix="")
21
     libassuan_config_prefix="$withval", libassuan_config_prefix="")
Lines 23-30 Link Here
23
    if test x${LIBASSUAN_CONFIG+set} != xset ; then
24
    if test x${LIBASSUAN_CONFIG+set} != xset ; then
24
      LIBASSUAN_CONFIG=$libassuan_config_prefix/bin/libassuan-config
25
      LIBASSUAN_CONFIG=$libassuan_config_prefix/bin/libassuan-config
25
    fi
26
    fi
27
  else
28
    case "${SYSROOT}" in
29
       /*)
30
         if test -x "${SYSROOT}/usr/bin/libassuan-config" ; then
31
           LIBASSUAN_CONFIG="${SYSROOT}/usr/bin/libassuan-config"
32
         fi
33
         ;;
34
       '')
35
         ;;
36
        *)
37
         AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.])
38
         ;;
39
     esac
26
  fi
40
  fi
27
  AC_PATH_PROG(LIBASSUAN_CONFIG, libassuan-config, no)
41
42
  AC_PATH_TOOL(LIBASSUAN_CONFIG, libassuan-config, no)
28
43
29
  tmp=ifelse([$1], ,1:0.9.2,$1)
44
  tmp=ifelse([$1], ,1:0.9.2,$1)
30
  if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
45
  if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
Lines 35-80 Link Here
35
    min_libassuan_version="$tmp"
50
    min_libassuan_version="$tmp"
36
  fi
51
  fi
37
52
38
  if test "$LIBASSUAN_CONFIG" != "no" ; then
53
  AC_MSG_CHECKING(for LIBASSUAN - version >= $min_libassuan_version)
39
    libassuan_version=`$LIBASSUAN_CONFIG --version`
40
  fi
41
  libassuan_version_major=`echo $libassuan_version | \
42
               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
43
  libassuan_version_minor=`echo $libassuan_version | \
44
               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
45
  libassuan_version_micro=`echo $libassuan_version | \
46
               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
47
48
  AC_MSG_CHECKING(for LIBASSUAN ifelse([$2], ,,[$2 ])- version >= $min_libassuan_version)
49
  ok=no
54
  ok=no
50
  if test "$LIBASSUAN_CONFIG" != "no" ; then
55
  if test "$LIBASSUAN_CONFIG" != "no" \
51
    ifelse([$2], ,,[if `$LIBASSUAN_CONFIG --thread=$2 2> /dev/null` ; then])
56
     && test -f "$LIBASSUAN_CONFIG" ; then
52
    req_major=`echo $min_libassuan_version | \
57
    req_major=`echo $min_libassuan_version | \
53
               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
58
               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
54
    req_minor=`echo $min_libassuan_version | \
59
    req_minor=`echo $min_libassuan_version | \
55
               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
60
               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
56
    req_micro=`echo $min_libassuan_version | \
61
    req_micro=`echo $min_libassuan_version | \
57
               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
62
               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
58
    if test "$libassuan_version_major" -gt "$req_major"; then
63
64
    libassuan_config_version=`$LIBASSUAN_CONFIG --version`
65
    major=`echo $libassuan_config_version | \
66
               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
67
    minor=`echo $libassuan_config_version | \
68
               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
69
    micro=`echo $libassuan_config_version | \
70
               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
71
72
    if test "$major" -gt "$req_major"; then
59
        ok=yes
73
        ok=yes
60
    else 
74
    else
61
        if test "$libassuan_version_major" -eq "$req_major"; then
75
        if test "$major" -eq "$req_major"; then
62
            if test "$libassuan_version_minor" -gt "$req_minor"; then
76
            if test "$minor" -gt "$req_minor"; then
63
               ok=yes
77
               ok=yes
64
            else
78
            else
65
               if test "$libassuan_version_minor" -eq "$req_minor"; then
79
               if test "$minor" -eq "$req_minor"; then
66
                   if test "$libassuan_version_micro" -ge "$req_micro"; then
80
                   if test "$micro" -ge "$req_micro"; then
67
                     ok=yes
81
                     ok=yes
68
                   fi
82
                   fi
69
               fi
83
               fi
70
            fi
84
            fi
71
        fi
85
        fi
72
    fi
86
    fi
73
    ifelse([$2], ,,[fi])
74
  fi
87
  fi
75
88
76
  if test $ok = yes; then
89
  if test $ok = yes; then
77
    AC_MSG_RESULT([yes ($libassuan_version)])
90
    AC_MSG_RESULT([yes ($libassuan_config_version)])
78
  else
91
  else
79
    AC_MSG_RESULT(no)
92
    AC_MSG_RESULT(no)
80
  fi
93
  fi
Lines 83-89 Link Here
83
    if test "$req_libassuan_api" -gt 0 ; then
96
    if test "$req_libassuan_api" -gt 0 ; then
84
      tmp=`$LIBASSUAN_CONFIG --api-version 2>/dev/null || echo 0`
97
      tmp=`$LIBASSUAN_CONFIG --api-version 2>/dev/null || echo 0`
85
      if test "$tmp" -gt 0 ; then
98
      if test "$tmp" -gt 0 ; then
86
        AC_MSG_CHECKING([LIBASSUAN ifelse([$2], ,,[$2 ])API version])
99
        AC_MSG_CHECKING([LIBASSUAN API version])
87
        if test "$req_libassuan_api" -eq "$tmp" ; then
100
        if test "$req_libassuan_api" -eq "$tmp" ; then
88
          AC_MSG_RESULT(okay)
101
          AC_MSG_RESULT(okay)
89
        else
102
        else
Lines 94-99 Link Here
94
    fi
107
    fi
95
  fi
108
  fi
96
109
110
  if test $ok = yes; then
111
    if test x"$host" != x ; then
112
      libassuan_config_host=`$LIBASSUAN_CONFIG --host 2>/dev/null || echo none`
113
      if test x"$libassuan_config_host" != xnone ; then
114
        if test x"$libassuan_config_host" != x"$host" ; then
115
  AC_MSG_WARN([[
116
***
117
*** The config script $LIBASSUAN_CONFIG was
118
*** built for $libassuan_config_host and thus may not match the
119
*** used host $host.
120
*** You may want to use the configure option --with-libassuan-prefix
121
*** to specify a matching config script or use \$SYSROOT.
122
***]])
123
        fi
124
      fi
125
    fi
126
  fi
97
])
127
])
98
128
99
dnl AM_CHECK_LIBASSUAN([MINIMUM-VERSION,
129
dnl AM_CHECK_LIBASSUAN([MINIMUM-VERSION,
Lines 131-175 Link Here
131
  AC_SUBST(LIBASSUAN_CFLAGS)
161
  AC_SUBST(LIBASSUAN_CFLAGS)
132
  AC_SUBST(LIBASSUAN_LIBS)
162
  AC_SUBST(LIBASSUAN_LIBS)
133
])
163
])
134
135
136
dnl AM_PATH_LIBASSUAN_PTH([MINIMUM-VERSION,
137
dnl                      [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
138
dnl Test for libassuan and define LIBASSUAN_PTH_CFLAGS and LIBASSUAN_PTH_LIBS
139
dnl
140
AC_DEFUN([AM_PATH_LIBASSUAN_PTH],
141
[ _AM_PATH_LIBASSUAN_COMMON($1,pth)
142
  if test $ok = yes; then
143
    LIBASSUAN_PTH_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pth --cflags`
144
    LIBASSUAN_PTH_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pth --libs`
145
    ifelse([$2], , :, [$2])
146
  else
147
    LIBASSUAN_PTH_CFLAGS=""
148
    LIBASSUAN_PTH_LIBS=""
149
    ifelse([$3], , :, [$3])
150
  fi
151
  AC_SUBST(LIBASSUAN_PTH_CFLAGS)
152
  AC_SUBST(LIBASSUAN_PTH_LIBS)
153
])
154
155
156
dnl AM_PATH_LIBASSUAN_PTHREAD([MINIMUM-VERSION,
157
dnl                           [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
158
dnl Test for libassuan and define LIBASSUAN_PTHREAD_CFLAGS 
159
dnl                           and LIBASSUAN_PTHREAD_LIBS
160
dnl
161
AC_DEFUN([AM_PATH_LIBASSUAN_PTHREAD],
162
[ _AM_PATH_LIBASSUAN_COMMON($1,pthread)
163
  if test $ok = yes; then
164
    LIBASSUAN_PTHREAD_CFLAGS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pthread --cflags`
165
    LIBASSUAN_PTHREAD_LIBS=`$LIBASSUAN_CONFIG $libassuan_config_args --thread=pthread --libs`
166
    ifelse([$2], , :, [$2])
167
  else
168
    LIBASSUAN_PTHREAD_CFLAGS=""
169
    LIBASSUAN_PTHREAD_LIBS=""
170
    ifelse([$3], , :, [$3])
171
  fi
172
  AC_SUBST(LIBASSUAN_PTHREAD_CFLAGS)
173
  AC_SUBST(LIBASSUAN_PTHREAD_LIBS)
174
])
175

Return to bug 654042