diff -rNd csync2-head/autogen.sh csync2-head+libgnutlsm4/autogen.sh
21c21
< aclocal
---
> aclocal -I m4
diff -rNd csync2-head/configure.ac csync2-head+libgnutlsm4/configure.ac
81c81
< 	AM_PATH_LIBGNUTLS(1.0.0, , [ AC_MSG_ERROR([[gnutls not found; install gnutls, gnutls-openssl and libtasn1 packages for your system or run configure with --disable-gnutls]]) ])
---
> 	AM_PATH_LIBGNUTLS(1.0.0,,[AC_MSG_ERROR([[gnutls not found; install gnutls and libtasn1 packages for your system or run configure with --disable-gnutls]]) ])
diff -rNd csync2-head/m4/libgnutls.m4 csync2-head+libgnutlsm4/m4/libgnutls.m4
0a1,174
> # Modified for LIBGNUTLS -- nmav
> # Configure paths for LIBGCRYPT
> # Shamelessly stolen from the one of XDELTA by Owen Taylor
> # Werner Koch   99-12-09
> # 10-years-old code is not as good as brandy would...
> # gnutls now uses pkg-config and doesn't ship gnutls-config anymore.
> # Giampaolo Tomassoni 2009-09-15
> 
> dnl AM_PATH_LIBGNUTLS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
> dnl Test for libgnutls, and define LIBGNUTLS_CFLAGS and LIBGNUTLS_LIBS
> dnl
> AC_DEFUN([AM_PATH_LIBGNUTLS],
> [dnl
> dnl Get the cflags and libraries from the libgnutls-config script
> dnl
> AC_ARG_WITH(libgnutls-prefix,
>           [  --with-libgnutls-prefix=PFX   Prefix where libgnutls is installed (optional)],
>           libgnutls_config_prefix="$withval", libgnutls_config_prefix="")
> 
>   if test x$libgnutls_config_prefix != x ; then
>      if test x${LIBGNUTLS_CONFIG+set} != xset ; then
>         LIBGNUTLS_CONFIG=$libgnutls_config_prefix/bin/libgnutls-config
>      fi
>   fi
> 
>   AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
>   AC_PATH_PROG(LIBGNUTLS_CONFIG, libgnutls-config, no)
>   min_libgnutls_version=ifelse([$1], ,0.1.0,$1)
>   AC_MSG_CHECKING(for libgnutls - version >= $min_libgnutls_version)
>   no_libgnutls=""
>   if ! test "$PKG_CONFIG" = "no" ; then
>     LIBGNUTLS_CFLAGS=`$PKG_CONFIG --cflags gnutls-extra`
>     LIBGNUTLS_LIBS=`$PKG_CONFIG --libs gnutls-extra`
>     libgnutls_config_version=`$PKG_CONFIG --modversion gnutls-extra`
> 
> 
>       ac_save_CFLAGS="$CFLAGS"
>       ac_save_LIBS="$LIBS"
>       CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
>       LIBS="$LIBS $LIBGNUTLS_LIBS"
>   elif ! test "$LIBGNUTLS_CONFIG" = "no" ; then
>     LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags`
>     LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs`
>     libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version`
> 
> 
>       ac_save_CFLAGS="$CFLAGS"
>       ac_save_LIBS="$LIBS"
>       CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
>       LIBS="$LIBS $LIBGNUTLS_LIBS"
>   else
>     no_libgnutls=yes
>   fi
> 
>   if test x$no_libgnutls = x ; then
> dnl
> dnl Now check if the installed libgnutls is sufficiently new. Also sanity
> dnl checks the results of libgnutls-config to some extent
> dnl
>       rm -f conf.libgnutlstest
>       AC_TRY_RUN([
> #include <stdio.h>
> #include <stdlib.h>
> #include <string.h>
> #include <gnutls/gnutls.h>
> 
> int
> main ()
> {
>     system ("touch conf.libgnutlstest");
> 
>     if( strcmp( gnutls_check_version(NULL), "$libgnutls_config_version" ) )
>     {
>       printf("\n*** 'libgnutls-config --version' returned %s, but LIBGNUTLS (%s)\n",
>              "$libgnutls_config_version", gnutls_check_version(NULL) );
>       printf("*** was found! If libgnutls-config was correct, then it is best\n");
>       printf("*** to remove the old version of LIBGNUTLS. You may also be able to fix the error\n");
>       printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
>       printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
>       printf("*** required on your system.\n");
>       printf("*** If libgnutls-config was wrong, set the environment variable LIBGNUTLS_CONFIG\n");
>       printf("*** to point to the correct copy of libgnutls-config, and remove the file config.cache\n");
>       printf("*** before re-running configure\n");
>     }
>     else if ( strcmp(gnutls_check_version(NULL), LIBGNUTLS_VERSION ) )
>     {
>       printf("\n*** LIBGNUTLS header file (version %s) does not match\n", LIBGNUTLS_VERSION);
>       printf("*** library (version %s)\n", gnutls_check_version(NULL) );
>     }
>     else
>     {
>       if ( gnutls_check_version( "$min_libgnutls_version" ) )
>       {
>         return 0;
>       }
>      else
>       {
>         printf("no\n*** An old version of LIBGNUTLS (%s) was found.\n",
>                 gnutls_check_version(NULL) );
>         printf("*** You need a version of LIBGNUTLS newer than %s. The latest version of\n",
>                "$min_libgnutls_version" );
>         printf("*** LIBGNUTLS is always available from ftp://gnutls.hellug.gr/pub/gnutls.\n");
>         printf("*** \n");
>         printf("*** If you have already installed a sufficiently new version, this error\n");
>         printf("*** probably means that the wrong copy of the libgnutls-config shell script is\n");
>         printf("*** being found. The easiest way to fix this is to remove the old version\n");
>         printf("*** of LIBGNUTLS, but you can also set the LIBGNUTLS_CONFIG environment to point to the\n");
>         printf("*** correct copy of libgnutls-config. (In this case, you will have to\n");
>         printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
>         printf("*** so that the correct libraries are found at run-time))\n");
>       }
>     }
>   return 1;
> }
> ],, no_libgnutls=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
>        CFLAGS="$ac_save_CFLAGS"
>        LIBS="$ac_save_LIBS"
>   fi
> 
>   if test "x$no_libgnutls" = x ; then
>      AC_MSG_RESULT(yes)
>      ifelse([$2], , :, [$2])
>   else
>      if test -f conf.libgnutlstest ; then
>         :
>      else
>         AC_MSG_RESULT(no)
>      fi
>      if test "$LIBGNUTLS_CONFIG" = "no" ; then
>        echo "*** The libgnutls-config script installed by LIBGNUTLS could not be found"
>        echo "*** If LIBGNUTLS was installed in PREFIX, make sure PREFIX/bin is in"
>        echo "*** your path, or set the LIBGNUTLS_CONFIG environment variable to the"
>        echo "*** full path to libgnutls-config."
>      else
>        if test -f conf.libgnutlstest ; then
>         :
>        else
>           echo "*** Could not run libgnutls test program, checking why..."
>           CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
>           LIBS="$LIBS $LIBGNUTLS_LIBS"
>           AC_TRY_LINK([
> #include <stdio.h>
> #include <stdlib.h>
> #include <string.h>
> #include <gnutls/gnutls.h>
> ],      [ return !!gnutls_check_version(NULL); ],
>         [ echo "*** The test program compiled, but did not run. This usually means"
>           echo "*** that the run-time linker is not finding LIBGNUTLS or finding the wrong"
>           echo "*** version of LIBGNUTLS. If it is not finding LIBGNUTLS, you'll need to set your"
>           echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
>           echo "*** to the installed location  Also, make sure you have run ldconfig if that"
>           echo "*** is required on your system"
>           echo "***"
>           echo "*** If you have an old version installed, it is best to remove it, although"
>           echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
>           echo "***" ],
>         [ echo "*** The test program failed to compile or link. See the file config.log for the"
>           echo "*** exact error that occured. This usually means LIBGNUTLS was incorrectly installed"
>           echo "*** or that you have moved LIBGNUTLS since it was installed. In the latter case, you"
>           echo "*** may want to edit the libgnutls-config script: $LIBGNUTLS_CONFIG" ])
>           CFLAGS="$ac_save_CFLAGS"
>           LIBS="$ac_save_LIBS"
>        fi
>      fi
>      LIBGNUTLS_CFLAGS=""
>      LIBGNUTLS_LIBS=""
>      ifelse([$3], , :, [$3])
>   fi
>   rm -f conf.libgnutlstest
>   AC_SUBST(LIBGNUTLS_CFLAGS)
>   AC_SUBST(LIBGNUTLS_LIBS)
> ])
> 
> dnl *-*wedit:notab*-*  Please keep this as the last line.