1 diff -ruN gnutls-1.0.24-orig/configure gnutls-1.0.24-1/configure
2 --- gnutls-1.0.24-orig/configure 2005-01-18 19:31:03.000000000 +0100
3 +++ gnutls-1.0.24-1/configure 2005-03-15 23:23:12.000000000 +0100
5 if test x$opt_developer_mode = xyes; then
6 CFLAGS="${CFLAGS} -g -Wno-format-y2k -Wall -Wcast-align -W -Wpointer-arith -Wchar-subscripts -Wformat-security -Wmissing-braces -Winline -Wstrict-prototypes"
8 - CFLAGS="${CFLAGS} -O2 -finline-functions"
9 + CFLAGS="${CFLAGS} -finline-functions"
12 if test x$opt_dmalloc_mode = xyes; then
13 @@ -25004,8 +25004,8 @@
17 -LIBGNUTLS_LIBS="-L${libdir} -lgnutls $LIBTASN1_LIBS $LIBGCRYPT_LIBS $LIBS"
18 -LIBGNUTLS_CFLAGS="$LIBGCRYPT_CFLAGS $LIBTASN1_CFLAGS -I${includedir}"
19 +LIBGNUTLS_LIBS="-lgnutls $LIBTASN1_LIBS $LIBGCRYPT_LIBS $LIBS"
20 +LIBGNUTLS_CFLAGS="$LIBGCRYPT_CFLAGS $LIBTASN1_CFLAGS"
22 CFLAGS="${CFLAGS} ${LIBGCRYPT_CFLAGS}"
24 @@ -25015,8 +25015,8 @@
25 SERV_LIBS="$LIBS $SERV_LIBS"
28 -LIBGNUTLS_EXTRA_LIBS="-L${libdir} -lgnutls-extra $LIBOPENCDK_LIBS $LZO_LIBS $LIBGNUTLS_LIBS"
29 -LIBGNUTLS_EXTRA_CFLAGS="$LIBOPENCDK_CFLAGS -I${includedir}"
30 +LIBGNUTLS_EXTRA_LIBS="-lgnutls-extra $LIBOPENCDK_LIBS $LZO_LIBS $LIBGNUTLS_LIBS"
31 +LIBGNUTLS_EXTRA_CFLAGS="$LIBOPENCDK_CFLAGS $LIBGNUTLS_CFLAGS"
35 diff -ruN gnutls-1.0.24-orig/configure.in gnutls-1.0.24-1/configure.in
36 --- gnutls-1.0.24-orig/configure.in 2004-11-14 00:06:57.000000000 +0100
37 +++ gnutls-1.0.24-1/configure.in 2005-03-15 23:24:35.000000000 +0100
39 if test x$opt_developer_mode = xyes; then
40 CFLAGS="${CFLAGS} -g -Wno-format-y2k -Wall -Wcast-align -W -Wpointer-arith -Wchar-subscripts -Wformat-security -Wmissing-braces -Winline -Wstrict-prototypes"
42 - CFLAGS="${CFLAGS} -O2 -finline-functions"
43 + CFLAGS="${CFLAGS} -finline-functions"
46 if test x$opt_dmalloc_mode = xyes; then
51 -LIBGNUTLS_LIBS="-L${libdir} -lgnutls $LIBTASN1_LIBS $LIBGCRYPT_LIBS $LIBS"
52 -LIBGNUTLS_CFLAGS="$LIBGCRYPT_CFLAGS $LIBTASN1_CFLAGS -I${includedir}"
53 +LIBGNUTLS_LIBS="-lgnutls $LIBTASN1_LIBS $LIBGCRYPT_LIBS $LIBS"
54 +LIBGNUTLS_CFLAGS="$LIBGCRYPT_CFLAGS $LIBTASN1_CFLAGS"
56 CFLAGS="${CFLAGS} ${LIBGCRYPT_CFLAGS}"
59 SERV_LIBS="$LIBS $SERV_LIBS"
62 -LIBGNUTLS_EXTRA_LIBS="-L${libdir} -lgnutls-extra $LIBOPENCDK_LIBS $LZO_LIBS $LIBGNUTLS_LIBS"
63 -LIBGNUTLS_EXTRA_CFLAGS="$LIBOPENCDK_CFLAGS -I${includedir}"
64 +LIBGNUTLS_EXTRA_LIBS="-lgnutls-extra $LIBOPENCDK_LIBS $LZO_LIBS $LIBGNUTLS_LIBS"
65 +LIBGNUTLS_EXTRA_CFLAGS="$LIBOPENCDK_CFLAGS $LIBGNUTLS_CFLAGS"
67 AC_SUBST(LIBGNUTLS_EXTRA_LIBS)
68 AC_SUBST(LIBGNUTLS_EXTRA_CFLAGS)