aboutsummaryrefslogtreecommitdiffstats
path: root/m4
diff options
context:
space:
mode:
authorGravatar Nokis Mavrogiannopoulos 2008-06-29 19:31:37 +0000
committerGravatar Nokis Mavrogiannopoulos 2008-06-29 19:31:37 +0000
commit07eff087f265fc3ea3108d6eb05329927d23be56 (patch)
tree029987a5f26730a84b17ba7ccda327a45b04a69c /m4
parenta6eff264b29df5007f2528b0fb251a4444c5ce33 (diff)
depend on main libgnutls library (and gnutls 2.4.x)
Diffstat (limited to 'm4')
-rw-r--r--m4/libgnutls.m4121
1 files changed, 58 insertions, 63 deletions
diff --git a/m4/libgnutls.m4 b/m4/libgnutls.m4
index 960bb2a..8479388 100644
--- a/m4/libgnutls.m4
+++ b/m4/libgnutls.m4
@@ -1,98 +1,97 @@
1dnl Autoconf macros for libgnutls-extra 1dnl Autoconf macros for libgnutls
2dnl $id$ 2dnl $id$
3 3
4# Modified for LIBGNUTLS_EXTRA -- nmav 4# Modified for LIBGNUTLS -- nmav
5# Configure paths for LIBGCRYPT 5# Configure paths for LIBGCRYPT
6# Shamelessly stolen from the one of XDELTA by Owen Taylor 6# Shamelessly stolen from the one of XDELTA by Owen Taylor
7# Werner Koch 99-12-09 7# Werner Koch 99-12-09
8 8
9dnl AM_PATH_LIBGNUTLS_EXTRA([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) 9dnl AM_PATH_LIBGNUTLS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
10dnl Test for libgnutls-extra, and define LIBGNUTLS_EXTRA_CFLAGS and LIBGNUTLS_EXTRA_LIBS 10dnl Test for libgnutls, and define LIBGNUTLS_CFLAGS and LIBGNUTLS_LIBS
11dnl 11dnl
12AC_DEFUN([AM_PATH_LIBGNUTLS_EXTRA], 12AC_DEFUN([AM_PATH_LIBGNUTLS],
13[dnl 13[dnl
14dnl Get the cflags and libraries from the libgnutls-extra-config script 14dnl Get the cflags and libraries from the libgnutls-config script
15dnl 15dnl
16AC_ARG_WITH(libgnutls-extra-prefix, 16AC_ARG_WITH(libgnutls-prefix,
17 [ --with-libgnutls-extra-prefix=PFX Prefix where libgnutls-extra is installed (optional)], 17 [ --with-libgnutls-prefix=PFX Prefix where libgnutls is installed (optional)],
18 libgnutls_extra_config_prefix="$withval", libgnutls_extra_config_prefix="") 18 libgnutls_config_prefix="$withval", libgnutls_config_prefix="")
19 19
20 if test x$libgnutls_extra_config_prefix != x ; then 20 if test x$libgnutls_config_prefix != x ; then
21 if test x${LIBGNUTLS_EXTRA_CONFIG+set} != xset ; then 21 if test x${LIBGNUTLS_CONFIG+set} != xset ; then
22 LIBGNUTLS_EXTRA_CONFIG=$libgnutls_extra_config_prefix/bin/libgnutls-extra-config 22 LIBGNUTLS_CONFIG=$libgnutls_config_prefix/bin/libgnutls-config
23 fi 23 fi
24 fi 24 fi
25 25
26 AC_PATH_PROG(LIBGNUTLS_EXTRA_CONFIG, libgnutls-extra-config, no) 26 AC_PATH_PROG(LIBGNUTLS_CONFIG, libgnutls-config, no)
27 min_libgnutls_version=ifelse([$1], ,0.1.0,$1) 27 min_libgnutls_version=ifelse([$1], ,0.1.0,$1)
28 AC_MSG_CHECKING(for libgnutls - version >= $min_libgnutls_version) 28 AC_MSG_CHECKING(for libgnutls - version >= $min_libgnutls_version)
29 no_libgnutls="" 29 no_libgnutls=""
30 if test "$LIBGNUTLS_EXTRA_CONFIG" = "no" ; then 30 if test "$LIBGNUTLS_CONFIG" = "no" ; then
31 no_libgnutls=yes 31 no_libgnutls=yes
32 else 32 else
33 LIBGNUTLS_EXTRA_CFLAGS=`$LIBGNUTLS_EXTRA_CONFIG $libgnutls_extra_config_args --cflags` 33 LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags`
34 LIBGNUTLS_EXTRA_LIBS=`$LIBGNUTLS_EXTRA_CONFIG $libgnutls_extra_config_args --libs` 34 LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs`
35 libgnutls_extra_config_version=`$LIBGNUTLS_EXTRA_CONFIG $libgnutls_extra_config_args --version` 35 libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version`
36 36
37 37
38 ac_save_CFLAGS="$CFLAGS" 38 ac_save_CFLAGS="$CFLAGS"
39 ac_save_LIBS="$LIBS" 39 ac_save_LIBS="$LIBS"
40 CFLAGS="$CFLAGS $LIBGNUTLS_EXTRA_CFLAGS" 40 CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
41 LIBS="$LIBS $LIBGNUTLS_EXTRA_LIBS" 41 LIBS="$LIBS $LIBGNUTLS_LIBS"
42dnl 42dnl
43dnl Now check if the installed libgnutls is sufficiently new. Also sanity 43dnl Now check if the installed libgnutls is sufficiently new. Also sanity
44dnl checks the results of libgnutls-extra-config to some extent 44dnl checks the results of libgnutls-config to some extent
45dnl 45dnl
46 rm -f conf.libgnutlstest 46 rm -f conf.libgnutlstest
47 AC_TRY_RUN([ 47 AC_TRY_RUN([
48#include <stdio.h> 48#include <stdio.h>
49#include <stdlib.h> 49#include <stdlib.h>
50#include <string.h> 50#include <string.h>
51#include <gnutls/extra.h> 51#include <gnutls/gnutls.h>
52 52
53int 53int
54main () 54main ()
55{ 55{
56 system ("touch conf.libgnutlstest"); 56 system ("touch conf.libgnutlstest");
57 57
58 if( strcmp( gnutls_extra_check_version(NULL), "$libgnutls_extra_config_version" ) ) 58 if( strcmp( gnutls_check_version(NULL), "$libgnutls_config_version" ) )
59 { 59 {
60 printf("\n*** 'libgnutls-extra-config --version' returned %s, but LIBGNUTLS_EXTRA (%s)\n", 60 printf("\n*** 'libgnutls-config --version' returned %s, but LIBGNUTLS (%s)\n",
61 "$libgnutls_extra_config_version", gnutls_extra_check_version(NULL) ); 61 "$libgnutls_config_version", gnutls_check_version(NULL) );
62 printf("*** was found! If libgnutls-extra-config was correct, then it is best\n"); 62 printf("*** was found! If libgnutls-config was correct, then it is best\n");
63 printf("*** to remove the old version of LIBGNUTLS_EXTRA. You may also be able to fix the error\n"); 63 printf("*** to remove the old version of LIBGNUTLS. You may also be able to fix the error\n");
64 printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); 64 printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
65 printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); 65 printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
66 printf("*** required on your system.\n"); 66 printf("*** required on your system.\n");
67 printf("*** If libgnutls-extra-config was wrong, set the environment variable LIBGNUTLS_EXTRA_CONFIG\n"); 67 printf("*** If libgnutls-config was wrong, set the environment variable LIBGNUTLS_CONFIG\n");
68 printf("*** to point to the correct copy of libgnutls-extra-config, and remove the file config.cache\n"); 68 printf("*** to point to the correct copy of libgnutls-config, and remove the file config.cache\n");
69 printf("*** before re-running configure\n"); 69 printf("*** before re-running configure\n");
70 } 70 }
71 else if ( strcmp(gnutls_extra_check_version(NULL), LIBGNUTLS_EXTRA_VERSION ) ) 71 else if ( strcmp(gnutls_check_version(NULL), LIBGNUTLS_VERSION ) )
72 { 72 {
73 printf("\n*** LIBGNUTLS_EXTRA header file (version %s) does not match\n", LIBGNUTLS_EXTRA_VERSION); 73 printf("\n*** LIBGNUTLS header file (version %s) does not match\n", LIBGNUTLS_VERSION);
74 printf("*** library (version %s). This is may be due to a different version of gnutls\n", gnutls_extra_check_version(NULL) ); 74 printf("*** library (version %s)\n", gnutls_check_version(NULL) );
75 printf("*** and gnutls-extra.\n");
76 } 75 }
77 else 76 else
78 { 77 {
79 if ( gnutls_extra_check_version( "$min_libgnutls_version" ) ) 78 if ( gnutls_check_version( "$min_libgnutls_version" ) )
80 { 79 {
81 return 0; 80 return 0;
82 } 81 }
83 else 82 else
84 { 83 {
85 printf("no\n*** An old version of LIBGNUTLS_EXTRA (%s) was found.\n", 84 printf("no\n*** An old version of LIBGNUTLS (%s) was found.\n",
86 gnutls_extra_check_version(NULL) ); 85 gnutls_check_version(NULL) );
87 printf("*** You need a version of LIBGNUTLS_EXTRA newer than %s. The latest version of\n", 86 printf("*** You need a version of LIBGNUTLS newer than %s. The latest version of\n",
88 "$min_libgnutls_version" ); 87 "$min_libgnutls_version" );
89 printf("*** LIBGNUTLS_EXTRA is always available from ftp://gnutls.hellug.gr/pub/gnutls.\n"); 88 printf("*** LIBGNUTLS is always available from ftp://gnutls.hellug.gr/pub/gnutls.\n");
90 printf("*** \n"); 89 printf("*** \n");
91 printf("*** If you have already installed a sufficiently new version, this error\n"); 90 printf("*** If you have already installed a sufficiently new version, this error\n");
92 printf("*** probably means that the wrong copy of the libgnutls-extra-config shell script is\n"); 91 printf("*** probably means that the wrong copy of the libgnutls-config shell script is\n");
93 printf("*** being found. The easiest way to fix this is to remove the old version\n"); 92 printf("*** being found. The easiest way to fix this is to remove the old version\n");
94 printf("*** of LIBGNUTLS_EXTRA, but you can also set the LIBGNUTLS_EXTRA_CONFIG environment to point to the\n"); 93 printf("*** of LIBGNUTLS, but you can also set the LIBGNUTLS_CONFIG environment to point to the\n");
95 printf("*** correct copy of libgnutls-extra-config. (In this case, you will have to\n"); 94 printf("*** correct copy of libgnutls-config. (In this case, you will have to\n");
96 printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); 95 printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
97 printf("*** so that the correct libraries are found at run-time))\n"); 96 printf("*** so that the correct libraries are found at run-time))\n");
98 } 97 }
@@ -113,27 +112,27 @@ main ()
113 else 112 else
114 AC_MSG_RESULT(no) 113 AC_MSG_RESULT(no)
115 fi 114 fi
116 if test "$LIBGNUTLS_EXTRA_CONFIG" = "no" ; then 115 if test "$LIBGNUTLS_CONFIG" = "no" ; then
117 echo "*** The libgnutls-extra-config script installed by LIBGNUTLS_EXTRA could not be found" 116 echo "*** The libgnutls-config script installed by LIBGNUTLS could not be found"
118 echo "*** If LIBGNUTLS_EXTRA was installed in PREFIX, make sure PREFIX/bin is in" 117 echo "*** If LIBGNUTLS was installed in PREFIX, make sure PREFIX/bin is in"
119 echo "*** your path, or set the LIBGNUTLS_EXTRA_CONFIG environment variable to the" 118 echo "*** your path, or set the LIBGNUTLS_CONFIG environment variable to the"
120 echo "*** full path to libgnutls-extra-config." 119 echo "*** full path to libgnutls-config."
121 else 120 else
122 if test -f conf.libgnutlstest ; then 121 if test -f conf.libgnutlstest ; then
123 : 122 :
124 else 123 else
125 echo "*** Could not run libgnutls test program, checking why..." 124 echo "*** Could not run libgnutls test program, checking why..."
126 CFLAGS="$CFLAGS $LIBGNUTLS_EXTRA_CFLAGS" 125 CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
127 LIBS="$LIBS $LIBGNUTLS_EXTRA_LIBS" 126 LIBS="$LIBS $LIBGNUTLS_LIBS"
128 AC_TRY_LINK([ 127 AC_TRY_LINK([
129#include <stdio.h> 128#include <stdio.h>
130#include <stdlib.h> 129#include <stdlib.h>
131#include <string.h> 130#include <string.h>
132#include <gnutls/extra.h> 131#include <gnutls/gnutls.h>
133], [ return !!gnutls_extra_check_version(NULL); ], 132], [ return !!gnutls_check_version(NULL); ],
134 [ echo "*** The test program compiled, but did not run. This usually means" 133 [ echo "*** The test program compiled, but did not run. This usually means"
135 echo "*** that the run-time linker is not finding LIBGNUTLS_EXTRA or finding the wrong" 134 echo "*** that the run-time linker is not finding LIBGNUTLS or finding the wrong"
136 echo "*** version of LIBGNUTLS_EXTRA. If it is not finding LIBGNUTLS_EXTRA, you'll need to set your" 135 echo "*** version of LIBGNUTLS. If it is not finding LIBGNUTLS, you'll need to set your"
137 echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" 136 echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
138 echo "*** to the installed location Also, make sure you have run ldconfig if that" 137 echo "*** to the installed location Also, make sure you have run ldconfig if that"
139 echo "*** is required on your system" 138 echo "*** is required on your system"
@@ -142,25 +141,21 @@ main ()
142 echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" 141 echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
143 echo "***" ], 142 echo "***" ],
144 [ echo "*** The test program failed to compile or link. See the file config.log for the" 143 [ echo "*** The test program failed to compile or link. See the file config.log for the"
145 echo "*** exact error that occured. This usually means LIBGNUTLS_EXTRA was incorrectly installed" 144 echo "*** exact error that occured. This usually means LIBGNUTLS was incorrectly installed"
146 echo "*** or that you have moved LIBGNUTLS_EXTRA since it was installed. In the latter case, you" 145 echo "*** or that you have moved LIBGNUTLS since it was installed. In the latter case, you"
147 echo "*** may want to edit the libgnutls-extra-config script: $LIBGNUTLS_EXTRA_CONFIG" ]) 146 echo "*** may want to edit the libgnutls-config script: $LIBGNUTLS_CONFIG" ])
148 CFLAGS="$ac_save_CFLAGS" 147 CFLAGS="$ac_save_CFLAGS"
149 LIBS="$ac_save_LIBS" 148 LIBS="$ac_save_LIBS"
150 fi 149 fi
151 fi 150 fi
152 LIBGNUTLS_EXTRA_CFLAGS="" 151 LIBGNUTLS_CFLAGS=""
153 LIBGNUTLS_EXTRA_LIBS="" 152 LIBGNUTLS_LIBS=""
154 ifelse([$3], , :, [$3]) 153 ifelse([$3], , :, [$3])
155 fi 154 fi
156 rm -f conf.libgnutlstest 155 rm -f conf.libgnutlstest
157 AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS)
158 AC_SUBST(LIBGNUTLS_EXTRA_LIBS)
159 156
160 LIBGNUTLS_LIBS=$LIBGNUTLS_EXTRA_LIBS 157 LIBGNUTLS_VERSION=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version`
161 LIBGNUTLS_CFLAGS=$LIBGNUTLS_EXTRA_CFLAGS 158 LIBGNUTLS_PREFIX="`$LIBGNUTLS_CONFIG $libgnutls_config_args --prefix`"
162 LIBGNUTLS_VERSION=`$LIBGNUTLS_EXTRA_CONFIG $libgnutls_extra_config_args --version`
163 LIBGNUTLS_PREFIX="`$LIBGNUTLS_EXTRA_CONFIG $libgnutls_extra_config_args --prefix`"
164 GNUTLS_CERTTOOL="${LIBGNUTLS_PREFIX}/bin/certtool" 159 GNUTLS_CERTTOOL="${LIBGNUTLS_PREFIX}/bin/certtool"
165 160
166 AC_SUBST(LIBGNUTLS_CFLAGS) 161 AC_SUBST(LIBGNUTLS_CFLAGS)
@@ -168,7 +163,7 @@ main ()
168 AC_SUBST(LIBGNUTLS_VERSION) 163 AC_SUBST(LIBGNUTLS_VERSION)
169 AC_SUBST(LIBGNUTLS_PREFIX) 164 AC_SUBST(LIBGNUTLS_PREFIX)
170 AC_SUBST(LIBGNUTLS_CERTTOOL) 165 AC_SUBST(LIBGNUTLS_CERTTOOL)
171 166
172]) 167])
173 168
174dnl *-*wedit:notab*-* Please keep this as the last line. 169dnl *-*wedit:notab*-* Please keep this as the last line.