1 files changed, 108 insertions, 108 deletions
diff --git a/linden/indra/libgcrypt/libgcrypt-1.2.2/src/libgcrypt.m4 b/linden/indra/libgcrypt/libgcrypt-1.2.2/src/libgcrypt.m4
index 4655678..20bd105 100755..100644
--- a/linden/indra/libgcrypt/libgcrypt-1.2.2/src/libgcrypt.m4
+++ b/linden/indra/libgcrypt/libgcrypt-1.2.2/src/libgcrypt.m4
@@ -1,108 +1,108 @@
-dnl Autoconf macros for libgcrypt
+dnl Autoconf macros for libgcrypt
-dnl       Copyright (C) 2002, 2004 Free Software Foundation, Inc.
+dnl       Copyright (C) 2002, 2004 Free Software Foundation, Inc.
-dnl
+dnl
-dnl This file is free software; as a special exception the author gives
+dnl This file is free software; as a special exception the author gives
-dnl unlimited permission to copy and/or distribute it, with or without
+dnl unlimited permission to copy and/or distribute it, with or without
-dnl modifications, as long as this notice is preserved.
+dnl modifications, as long as this notice is preserved.
-dnl
+dnl
-dnl This file is distributed in the hope that it will be useful, but
+dnl This file is distributed in the hope that it will be useful, but
-dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION,
+dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION,
-dnl                   [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
+dnl                   [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
-dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS.
+dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS.
-dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed
+dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed
-dnl with the API version to also check the API compatibility. Example:
+dnl with the API version to also check the API compatibility. Example:
-dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed 
+dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed 
-dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1.  Using
+dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1.  Using
-dnl this features allows to prevent build against newer versions of libgcrypt
+dnl this features allows to prevent build against newer versions of libgcrypt
-dnl with a changed API.
+dnl with a changed API.
-dnl
+dnl
-AC_DEFUN([AM_PATH_LIBGCRYPT],
+AC_DEFUN([AM_PATH_LIBGCRYPT],
-[ AC_ARG_WITH(libgcrypt-prefix,
+[ AC_ARG_WITH(libgcrypt-prefix,
-            AC_HELP_STRING([--with-libgcrypt-prefix=PFX],
+            AC_HELP_STRING([--with-libgcrypt-prefix=PFX],
-                           [prefix where LIBGCRYPT is installed (optional)]),
+                           [prefix where LIBGCRYPT is installed (optional)]),
-     libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="")
+     libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="")
-  if test x$libgcrypt_config_prefix != x ; then
+  if test x$libgcrypt_config_prefix != x ; then
-     if test x${LIBGCRYPT_CONFIG+set} != xset ; then
+     if test x${LIBGCRYPT_CONFIG+set} != xset ; then
-        LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config
+        LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config
-     fi
+     fi
-  fi
+  fi
-  AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no)
+  AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no)
-  tmp=ifelse([$1], ,1:1.2.0,$1)
+  tmp=ifelse([$1], ,1:1.2.0,$1)
-  if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
+  if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
-     req_libgcrypt_api=`echo "$tmp"     | sed 's/\(.*\):\(.*\)/\1/'`
+     req_libgcrypt_api=`echo "$tmp"     | sed 's/\(.*\):\(.*\)/\1/'`
-     min_libgcrypt_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
+     min_libgcrypt_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
-  else
+  else
-     req_libgcrypt_api=0
+     req_libgcrypt_api=0
-     min_libgcrypt_version="$tmp"
+     min_libgcrypt_version="$tmp"
-  fi
+  fi
-  AC_MSG_CHECKING(for LIBGCRYPT - version >= $min_libgcrypt_version)
+  AC_MSG_CHECKING(for LIBGCRYPT - version >= $min_libgcrypt_version)
-  ok=no
+  ok=no
-  if test "$LIBGCRYPT_CONFIG" != "no" ; then
+  if test "$LIBGCRYPT_CONFIG" != "no" ; then
-    req_major=`echo $min_libgcrypt_version | \
+    req_major=`echo $min_libgcrypt_version | \
-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
-    req_minor=`echo $min_libgcrypt_version | \
+    req_minor=`echo $min_libgcrypt_version | \
-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
-    req_micro=`echo $min_libgcrypt_version | \
+    req_micro=`echo $min_libgcrypt_version | \
-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
-    libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version`
+    libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version`
-    major=`echo $libgcrypt_config_version | \
+    major=`echo $libgcrypt_config_version | \
-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
-    minor=`echo $libgcrypt_config_version | \
+    minor=`echo $libgcrypt_config_version | \
-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
-    micro=`echo $libgcrypt_config_version | \
+    micro=`echo $libgcrypt_config_version | \
-               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
+               sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
-    if test "$major" -gt "$req_major"; then
+    if test "$major" -gt "$req_major"; then
-        ok=yes
+        ok=yes
-    else 
+    else 
-        if test "$major" -eq "$req_major"; then
+        if test "$major" -eq "$req_major"; then
-            if test "$minor" -gt "$req_minor"; then
+            if test "$minor" -gt "$req_minor"; then
-               ok=yes
+               ok=yes
-            else
+            else
-               if test "$minor" -eq "$req_minor"; then
+               if test "$minor" -eq "$req_minor"; then
-                   if test "$micro" -ge "$req_micro"; then
+                   if test "$micro" -ge "$req_micro"; then
-                     ok=yes
+                     ok=yes
-                   fi
+                   fi
-               fi
+               fi
-            fi
+            fi
-        fi
+        fi
-    fi
+    fi
-  fi
+  fi
-  if test $ok = yes; then
+  if test $ok = yes; then
-    AC_MSG_RESULT(yes)
+    AC_MSG_RESULT(yes)
-  else
+  else
-    AC_MSG_RESULT(no)
+    AC_MSG_RESULT(no)
-  fi
+  fi
-  if test $ok = yes; then
+  if test $ok = yes; then
-     # If we have a recent libgcrypt, we should also check that the
+     # If we have a recent libgcrypt, we should also check that the
-     # API is compatible
+     # API is compatible
-     if test "$req_libgcrypt_api" -gt 0 ; then
+     if test "$req_libgcrypt_api" -gt 0 ; then
-        tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0`
+        tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0`
-        if test "$tmp" -gt 0 ; then
+        if test "$tmp" -gt 0 ; then
-           AC_MSG_CHECKING([LIBGCRYPT API version])
+           AC_MSG_CHECKING([LIBGCRYPT API version])
-           if test "$req_libgcrypt_api" -eq "$tmp" ; then
+           if test "$req_libgcrypt_api" -eq "$tmp" ; then
-             AC_MSG_RESULT(okay)
+             AC_MSG_RESULT(okay)
-           else
+           else
-             ok=no
+             ok=no
-             AC_MSG_RESULT([does not match (want=$req_libgcrypt_api got=$tmp)])
+             AC_MSG_RESULT([does not match (want=$req_libgcrypt_api got=$tmp)])
-           fi
+           fi
-        fi
+        fi
-     fi
+     fi
-  fi
+  fi
-  if test $ok = yes; then
+  if test $ok = yes; then
-    LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
+    LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
-    LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
+    LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
-    ifelse([$2], , :, [$2])
+    ifelse([$2], , :, [$2])
-  else
+  else
-    LIBGCRYPT_CFLAGS=""
+    LIBGCRYPT_CFLAGS=""
-    LIBGCRYPT_LIBS=""
+    LIBGCRYPT_LIBS=""
-    ifelse([$3], , :, [$3])
+    ifelse([$3], , :, [$3])
-  fi
+  fi
-  AC_SUBST(LIBGCRYPT_CFLAGS)
+  AC_SUBST(LIBGCRYPT_CFLAGS)
-  AC_SUBST(LIBGCRYPT_LIBS)
+  AC_SUBST(LIBGCRYPT_LIBS)
-])
+])

diff --git a/linden/indra/libgcrypt/libgcrypt-1.2.2/src/libgcrypt.m4 b/linden/indra/libgcrypt/libgcrypt-1.2.2/src/libgcrypt.m4 index 4655678..20bd105 100755..100644 --- a/linden/indra/libgcrypt/libgcrypt-1.2.2/src/libgcrypt.m4 +++ b/linden/indra/libgcrypt/libgcrypt-1.2.2/src/libgcrypt.m4
@@ -1,108 +1,108 @@
1	dnl Autoconf macros for libgcrypt	1	dnl Autoconf macros for libgcrypt
2	dnl Copyright (C) 2002, 2004 Free Software Foundation, Inc.	2	dnl Copyright (C) 2002, 2004 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
6	dnl modifications, as long as this notice is preserved.	6	dnl modifications, as long as this notice is preserved.
7	dnl	7	dnl
8	dnl This file is distributed in the hope that it will be useful, but	8	dnl This file is distributed in the hope that it will be useful, but
9	dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the	9	dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
10	dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	10	dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
11		11
12		12
13	dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION,	13	dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION,
14	dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])	14	dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
15	dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS.	15	dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS.
16	dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed	16	dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed
17	dnl with the API version to also check the API compatibility. Example:	17	dnl with the API version to also check the API compatibility. Example:
18	dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed	18	dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed
19	dnl version of libgcrypt is at least 1.2.5 and the API number is 1. Using	19	dnl version of libgcrypt is at least 1.2.5 and the API number is 1. Using
20	dnl this features allows to prevent build against newer versions of libgcrypt	20	dnl this features allows to prevent build against newer versions of libgcrypt
21	dnl with a changed API.	21	dnl with a changed API.
22	dnl	22	dnl
23	AC_DEFUN([AM_PATH_LIBGCRYPT],	23	AC_DEFUN([AM_PATH_LIBGCRYPT],
24	[ AC_ARG_WITH(libgcrypt-prefix,	24	[ AC_ARG_WITH(libgcrypt-prefix,
25	AC_HELP_STRING([--with-libgcrypt-prefix=PFX],	25	AC_HELP_STRING([--with-libgcrypt-prefix=PFX],
26	[prefix where LIBGCRYPT is installed (optional)]),	26	[prefix where LIBGCRYPT is installed (optional)]),
27	libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="")	27	libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="")
28	if test x$libgcrypt_config_prefix != x ; then	28	if test x$libgcrypt_config_prefix != x ; then
29	if test x${LIBGCRYPT_CONFIG+set} != xset ; then	29	if test x${LIBGCRYPT_CONFIG+set} != xset ; then
30	LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config	30	LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config
31	fi	31	fi
32	fi	32	fi
33		33
34	AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no)	34	AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no)
35	tmp=ifelse([$1], ,1:1.2.0,$1)	35	tmp=ifelse([$1], ,1:1.2.0,$1)
36	if echo "$tmp" \| grep ':' >/dev/null 2>/dev/null ; then	36	if echo "$tmp" \| grep ':' >/dev/null 2>/dev/null ; then
37	req_libgcrypt_api=`echo "$tmp" \| sed 's/\(.\):\(.\)/\1/'`	37	req_libgcrypt_api=`echo "$tmp" \| sed 's/\(.\):\(.\)/\1/'`
38	min_libgcrypt_version=`echo "$tmp" \| sed 's/\(.\):\(.\)/\2/'`	38	min_libgcrypt_version=`echo "$tmp" \| sed 's/\(.\):\(.\)/\2/'`
39	else	39	else
40	req_libgcrypt_api=0	40	req_libgcrypt_api=0
41	min_libgcrypt_version="$tmp"	41	min_libgcrypt_version="$tmp"
42	fi	42	fi
43		43
44	AC_MSG_CHECKING(for LIBGCRYPT - version >= $min_libgcrypt_version)	44	AC_MSG_CHECKING(for LIBGCRYPT - version >= $min_libgcrypt_version)
45	ok=no	45	ok=no
46	if test "$LIBGCRYPT_CONFIG" != "no" ; then	46	if test "$LIBGCRYPT_CONFIG" != "no" ; then
47	req_major=`echo $min_libgcrypt_version \| \	47	req_major=`echo $min_libgcrypt_version \| \
48	sed 's/\([[0-9]]\)\.\([[0-9]]\)\.\([[0-9]]*\)/\1/'`	48	sed 's/\([[0-9]]\)\.\([[0-9]]\)\.\([[0-9]]*\)/\1/'`
49	req_minor=`echo $min_libgcrypt_version \| \	49	req_minor=`echo $min_libgcrypt_version \| \
50	sed 's/\([[0-9]]\)\.\([[0-9]]\)\.\([[0-9]]*\)/\2/'`	50	sed 's/\([[0-9]]\)\.\([[0-9]]\)\.\([[0-9]]*\)/\2/'`
51	req_micro=`echo $min_libgcrypt_version \| \	51	req_micro=`echo $min_libgcrypt_version \| \
52	sed 's/\([[0-9]]\)\.\([[0-9]]\)\.\([[0-9]]*\)/\3/'`	52	sed 's/\([[0-9]]\)\.\([[0-9]]\)\.\([[0-9]]*\)/\3/'`
53	libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version`	53	libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version`
54	major=`echo $libgcrypt_config_version \| \	54	major=`echo $libgcrypt_config_version \| \
55	sed 's/\([[0-9]]\)\.\([[0-9]]\)\.\([[0-9]]\)./\1/'`	55	sed 's/\([[0-9]]\)\.\([[0-9]]\)\.\([[0-9]]\)./\1/'`
56	minor=`echo $libgcrypt_config_version \| \	56	minor=`echo $libgcrypt_config_version \| \
57	sed 's/\([[0-9]]\)\.\([[0-9]]\)\.\([[0-9]]\)./\2/'`	57	sed 's/\([[0-9]]\)\.\([[0-9]]\)\.\([[0-9]]\)./\2/'`
58	micro=`echo $libgcrypt_config_version \| \	58	micro=`echo $libgcrypt_config_version \| \
59	sed 's/\([[0-9]]\)\.\([[0-9]]\)\.\([[0-9]]\)./\3/'`	59	sed 's/\([[0-9]]\)\.\([[0-9]]\)\.\([[0-9]]\)./\3/'`
60	if test "$major" -gt "$req_major"; then	60	if test "$major" -gt "$req_major"; then
61	ok=yes	61	ok=yes
62	else	62	else
63	if test "$major" -eq "$req_major"; then	63	if test "$major" -eq "$req_major"; then
64	if test "$minor" -gt "$req_minor"; then	64	if test "$minor" -gt "$req_minor"; then
65	ok=yes	65	ok=yes
66	else	66	else
67	if test "$minor" -eq "$req_minor"; then	67	if test "$minor" -eq "$req_minor"; then
68	if test "$micro" -ge "$req_micro"; then	68	if test "$micro" -ge "$req_micro"; then
69	ok=yes	69	ok=yes
70	fi	70	fi
71	fi	71	fi
72	fi	72	fi
73	fi	73	fi
74	fi	74	fi
75	fi	75	fi
76	if test $ok = yes; then	76	if test $ok = yes; then
77	AC_MSG_RESULT(yes)	77	AC_MSG_RESULT(yes)
78	else	78	else
79	AC_MSG_RESULT(no)	79	AC_MSG_RESULT(no)
80	fi	80	fi
81	if test $ok = yes; then	81	if test $ok = yes; then
82	# If we have a recent libgcrypt, we should also check that the	82	# If we have a recent libgcrypt, we should also check that the
83	# API is compatible	83	# API is compatible
84	if test "$req_libgcrypt_api" -gt 0 ; then	84	if test "$req_libgcrypt_api" -gt 0 ; then
85	tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null \|\| echo 0`	85	tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null \|\| echo 0`
86	if test "$tmp" -gt 0 ; then	86	if test "$tmp" -gt 0 ; then
87	AC_MSG_CHECKING([LIBGCRYPT API version])	87	AC_MSG_CHECKING([LIBGCRYPT API version])
88	if test "$req_libgcrypt_api" -eq "$tmp" ; then	88	if test "$req_libgcrypt_api" -eq "$tmp" ; then
89	AC_MSG_RESULT(okay)	89	AC_MSG_RESULT(okay)
90	else	90	else
91	ok=no	91	ok=no
92	AC_MSG_RESULT([does not match (want=$req_libgcrypt_api got=$tmp)])	92	AC_MSG_RESULT([does not match (want=$req_libgcrypt_api got=$tmp)])
93	fi	93	fi
94	fi	94	fi
95	fi	95	fi
96	fi	96	fi
97	if test $ok = yes; then	97	if test $ok = yes; then
98	LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`	98	LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
99	LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`	99	LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
100	ifelse([$2], , :, [$2])	100	ifelse([$2], , :, [$2])
101	else	101	else
102	LIBGCRYPT_CFLAGS=""	102	LIBGCRYPT_CFLAGS=""
103	LIBGCRYPT_LIBS=""	103	LIBGCRYPT_LIBS=""
104	ifelse([$3], , :, [$3])	104	ifelse([$3], , :, [$3])
105	fi	105	fi
106	AC_SUBST(LIBGCRYPT_CFLAGS)	106	AC_SUBST(LIBGCRYPT_CFLAGS)
107	AC_SUBST(LIBGCRYPT_LIBS)	107	AC_SUBST(LIBGCRYPT_LIBS)
108	])	108	])