diff -Naur a/net-im/mcabber/files/fix-without-otr.patch b/net-im/mcabber/files/fix-without-otr.patch --- a/net-im/mcabber/files/fix-without-otr.patch 1970-01-01 01:00:00.000000000 +0100 +++ b/net-im/mcabber/files/fix-without-otr.patch 2013-01-28 15:42:39.226340032 +0100 @@ -0,0 +1,1578 @@ + +# HG changeset patch +# User Mikael Berthe +# Date 1355506356 -3600 +# Node ID f36d60bed54bd30fea211e8d9befa4f5ff98da86 +# Parent 710654b6b85f57c28a7c643a5ad6273f66aa2039 +Move M4 macros from macros/missing/ to macros/ +This patch allows to build mcabber when OTR development packages are not +installed. Issue reported by hirthwork in the MUC room. + +diff -r 710654b6b85f -r f36d60bed54b mcabber/macros/glib-2.0.m4 +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ b/mcabber/macros/glib-2.0.m4 Fri Dec 14 18:32:36 2012 +0100 +@@ -0,0 +1,214 @@ ++# Configure paths for GLIB ++# Owen Taylor 1997-2001 ++ ++dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) ++dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject, ++dnl gthread, or gio is specified in MODULES, pass to pkg-config ++dnl ++AC_DEFUN([AM_PATH_GLIB_2_0], ++[dnl ++dnl Get the cflags and libraries from pkg-config ++dnl ++AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], ++ , enable_glibtest=yes) ++ ++ pkg_config_args=glib-2.0 ++ for module in . $4 ++ do ++ case "$module" in ++ gmodule) ++ pkg_config_args="$pkg_config_args gmodule-2.0" ++ ;; ++ gmodule-no-export) ++ pkg_config_args="$pkg_config_args gmodule-no-export-2.0" ++ ;; ++ gobject) ++ pkg_config_args="$pkg_config_args gobject-2.0" ++ ;; ++ gthread) ++ pkg_config_args="$pkg_config_args gthread-2.0" ++ ;; ++ gio*) ++ pkg_config_args="$pkg_config_args $module-2.0" ++ ;; ++ esac ++ done ++ ++ PKG_PROG_PKG_CONFIG([0.16]) ++ ++ no_glib="" ++ ++ if test "x$PKG_CONFIG" = x ; then ++ no_glib=yes ++ PKG_CONFIG=no ++ fi ++ ++ min_glib_version=ifelse([$1], ,2.0.0,$1) ++ AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) ++ ++ if test x$PKG_CONFIG != xno ; then ++ ## don't try to run the test against uninstalled libtool libs ++ if $PKG_CONFIG --uninstalled $pkg_config_args; then ++ echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" ++ enable_glibtest=no ++ fi ++ ++ if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then ++ : ++ else ++ no_glib=yes ++ fi ++ fi ++ ++ if test x"$no_glib" = x ; then ++ GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` ++ GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` ++ GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` ++ GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0` ++ ++ GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` ++ GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` ++ glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` ++ glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` ++ glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` ++ if test "x$enable_glibtest" = "xyes" ; then ++ ac_save_CFLAGS="$CFLAGS" ++ ac_save_LIBS="$LIBS" ++ CFLAGS="$CFLAGS $GLIB_CFLAGS" ++ LIBS="$GLIB_LIBS $LIBS" ++dnl ++dnl Now check if the installed GLIB is sufficiently new. (Also sanity ++dnl checks the results of pkg-config to some extent) ++dnl ++ rm -f conf.glibtest ++ AC_TRY_RUN([ ++#include ++#include ++#include ++ ++int ++main () ++{ ++ unsigned int major, minor, micro; ++ char *tmp_version; ++ ++ fclose (fopen ("conf.glibtest", "w")); ++ ++ /* HP/UX 9 (%@#!) writes to sscanf strings */ ++ tmp_version = g_strdup("$min_glib_version"); ++ if (sscanf(tmp_version, "%u.%u.%u", &major, &minor, µ) != 3) { ++ printf("%s, bad version string\n", "$min_glib_version"); ++ exit(1); ++ } ++ ++ if ((glib_major_version != $glib_config_major_version) || ++ (glib_minor_version != $glib_config_minor_version) || ++ (glib_micro_version != $glib_config_micro_version)) ++ { ++ printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", ++ $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, ++ glib_major_version, glib_minor_version, glib_micro_version); ++ printf ("*** was found! If pkg-config was correct, then it is best\n"); ++ printf ("*** to remove the old version of GLib. 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 pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); ++ printf("*** to point to the correct configuration files\n"); ++ } ++ else if ((glib_major_version != GLIB_MAJOR_VERSION) || ++ (glib_minor_version != GLIB_MINOR_VERSION) || ++ (glib_micro_version != GLIB_MICRO_VERSION)) ++ { ++ printf("*** GLIB header files (version %d.%d.%d) do not match\n", ++ GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); ++ printf("*** library (version %d.%d.%d)\n", ++ glib_major_version, glib_minor_version, glib_micro_version); ++ } ++ else ++ { ++ if ((glib_major_version > major) || ++ ((glib_major_version == major) && (glib_minor_version > minor)) || ++ ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) ++ { ++ return 0; ++ } ++ else ++ { ++ printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n", ++ glib_major_version, glib_minor_version, glib_micro_version); ++ printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n", ++ major, minor, micro); ++ printf("*** GLIB is always available from ftp://ftp.gtk.org.\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 pkg-config shell script is\n"); ++ printf("*** being found. The easiest way to fix this is to remove the old version\n"); ++ printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); ++ printf("*** correct copy of pkg-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_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi ++ fi ++ if test "x$no_glib" = x ; then ++ AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) ++ ifelse([$2], , :, [$2]) ++ else ++ AC_MSG_RESULT(no) ++ if test "$PKG_CONFIG" = "no" ; then ++ echo "*** A new enough version of pkg-config was not found." ++ echo "*** See http://www.freedesktop.org/software/pkgconfig/" ++ else ++ if test -f conf.glibtest ; then ++ : ++ else ++ echo "*** Could not run GLIB test program, checking why..." ++ ac_save_CFLAGS="$CFLAGS" ++ ac_save_LIBS="$LIBS" ++ CFLAGS="$CFLAGS $GLIB_CFLAGS" ++ LIBS="$LIBS $GLIB_LIBS" ++ AC_TRY_LINK([ ++#include ++#include ++], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], ++ [ echo "*** The test program compiled, but did not run. This usually means" ++ echo "*** that the run-time linker is not finding GLIB or finding the wrong" ++ echo "*** version of GLIB. If it is not finding GLIB, 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 "*** The test program failed to compile or link. See the file config.log for the" ++ echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) ++ CFLAGS="$ac_save_CFLAGS" ++ LIBS="$ac_save_LIBS" ++ fi ++ fi ++ GLIB_CFLAGS="" ++ GLIB_LIBS="" ++ GLIB_GENMARSHAL="" ++ GOBJECT_QUERY="" ++ GLIB_MKENUMS="" ++ GLIB_COMPILE_RESOURCES="" ++ ifelse([$3], , :, [$3]) ++ fi ++ AC_SUBST(GLIB_CFLAGS) ++ AC_SUBST(GLIB_LIBS) ++ AC_SUBST(GLIB_GENMARSHAL) ++ AC_SUBST(GOBJECT_QUERY) ++ AC_SUBST(GLIB_MKENUMS) ++ AC_SUBST(GLIB_COMPILE_RESOURCES) ++ rm -f conf.glibtest ++]) +diff -r 710654b6b85f -r f36d60bed54b mcabber/macros/gpgme.m4 +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ b/mcabber/macros/gpgme.m4 Fri Dec 14 18:32:36 2012 +0100 +@@ -0,0 +1,307 @@ ++# gpgme.m4 - autoconf macro to detect GPGME. ++# Copyright (C) 2002, 2003, 2004 g10 Code GmbH ++# ++# This file is free software; as a special exception the author gives ++# unlimited permission to copy and/or distribute it, with or without ++# modifications, as long as this notice is preserved. ++# ++# This file is distributed in the hope that it will be useful, but ++# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the ++# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ++ ++ ++AC_DEFUN([_AM_PATH_GPGME_CONFIG], ++[ AC_ARG_WITH(gpgme-prefix, ++ AC_HELP_STRING([--with-gpgme-prefix=PFX], ++ [prefix where GPGME is installed (optional)]), ++ gpgme_config_prefix="$withval", gpgme_config_prefix="") ++ if test "x$gpgme_config_prefix" != x ; then ++ GPGME_CONFIG="$gpgme_config_prefix/bin/gpgme-config" ++ fi ++ AC_PATH_PROG(GPGME_CONFIG, gpgme-config, no) ++ ++ if test "$GPGME_CONFIG" != "no" ; then ++ gpgme_version=`$GPGME_CONFIG --version` ++ fi ++ gpgme_version_major=`echo $gpgme_version | \ ++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` ++ gpgme_version_minor=`echo $gpgme_version | \ ++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` ++ gpgme_version_micro=`echo $gpgme_version | \ ++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'` ++]) ++ ++dnl AM_PATH_GPGME([MINIMUM-VERSION, ++dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) ++dnl Test for libgpgme and define GPGME_CFLAGS and GPGME_LIBS. ++dnl ++AC_DEFUN([AM_PATH_GPGME], ++[ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl ++ tmp=ifelse([$1], ,1:0.4.2,$1) ++ if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then ++ req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` ++ min_gpgme_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` ++ else ++ req_gpgme_api=0 ++ min_gpgme_version="$tmp" ++ fi ++ ++ AC_MSG_CHECKING(for GPGME - version >= $min_gpgme_version) ++ ok=no ++ if test "$GPGME_CONFIG" != "no" ; then ++ req_major=`echo $min_gpgme_version | \ ++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` ++ req_minor=`echo $min_gpgme_version | \ ++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` ++ req_micro=`echo $min_gpgme_version | \ ++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` ++ if test "$gpgme_version_major" -gt "$req_major"; then ++ ok=yes ++ else ++ if test "$gpgme_version_major" -eq "$req_major"; then ++ if test "$gpgme_version_minor" -gt "$req_minor"; then ++ ok=yes ++ else ++ if test "$gpgme_version_minor" -eq "$req_minor"; then ++ if test "$gpgme_version_micro" -ge "$req_micro"; then ++ ok=yes ++ fi ++ fi ++ fi ++ fi ++ fi ++ fi ++ if test $ok = yes; then ++ # If we have a recent GPGME, we should also check that the ++ # API is compatible. ++ if test "$req_gpgme_api" -gt 0 ; then ++ tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` ++ if test "$tmp" -gt 0 ; then ++ if test "$req_gpgme_api" -ne "$tmp" ; then ++ ok=no ++ fi ++ fi ++ fi ++ fi ++ if test $ok = yes; then ++ GPGME_CFLAGS=`$GPGME_CONFIG --cflags` ++ GPGME_LIBS=`$GPGME_CONFIG --libs` ++ AC_MSG_RESULT(yes) ++ ifelse([$2], , :, [$2]) ++ else ++ GPGME_CFLAGS="" ++ GPGME_LIBS="" ++ AC_MSG_RESULT(no) ++ ifelse([$3], , :, [$3]) ++ fi ++ AC_SUBST(GPGME_CFLAGS) ++ AC_SUBST(GPGME_LIBS) ++]) ++ ++dnl AM_PATH_GPGME_PTH([MINIMUM-VERSION, ++dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) ++dnl Test for libgpgme and define GPGME_PTH_CFLAGS and GPGME_PTH_LIBS. ++dnl ++AC_DEFUN([AM_PATH_GPGME_PTH], ++[ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl ++ tmp=ifelse([$1], ,1:0.4.2,$1) ++ if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then ++ req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` ++ min_gpgme_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` ++ else ++ req_gpgme_api=0 ++ min_gpgme_version="$tmp" ++ fi ++ ++ AC_MSG_CHECKING(for GPGME Pth - version >= $min_gpgme_version) ++ ok=no ++ if test "$GPGME_CONFIG" != "no" ; then ++ if `$GPGME_CONFIG --thread=pth 2> /dev/null` ; then ++ req_major=`echo $min_gpgme_version | \ ++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` ++ req_minor=`echo $min_gpgme_version | \ ++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` ++ req_micro=`echo $min_gpgme_version | \ ++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` ++ if test "$gpgme_version_major" -gt "$req_major"; then ++ ok=yes ++ else ++ if test "$gpgme_version_major" -eq "$req_major"; then ++ if test "$gpgme_version_minor" -gt "$req_minor"; then ++ ok=yes ++ else ++ if test "$gpgme_version_minor" -eq "$req_minor"; then ++ if test "$gpgme_version_micro" -ge "$req_micro"; then ++ ok=yes ++ fi ++ fi ++ fi ++ fi ++ fi ++ fi ++ fi ++ if test $ok = yes; then ++ # If we have a recent GPGME, we should also check that the ++ # API is compatible. ++ if test "$req_gpgme_api" -gt 0 ; then ++ tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` ++ if test "$tmp" -gt 0 ; then ++ if test "$req_gpgme_api" -ne "$tmp" ; then ++ ok=no ++ fi ++ fi ++ fi ++ fi ++ if test $ok = yes; then ++ GPGME_PTH_CFLAGS=`$GPGME_CONFIG --thread=pth --cflags` ++ GPGME_PTH_LIBS=`$GPGME_CONFIG --thread=pth --libs` ++ AC_MSG_RESULT(yes) ++ ifelse([$2], , :, [$2]) ++ else ++ GPGME_PTH_CFLAGS="" ++ GPGME_PTH_LIBS="" ++ AC_MSG_RESULT(no) ++ ifelse([$3], , :, [$3]) ++ fi ++ AC_SUBST(GPGME_PTH_CFLAGS) ++ AC_SUBST(GPGME_PTH_LIBS) ++]) ++ ++dnl AM_PATH_GPGME_PTHREAD([MINIMUM-VERSION, ++dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) ++dnl Test for libgpgme and define GPGME_PTHREAD_CFLAGS ++dnl and GPGME_PTHREAD_LIBS. ++dnl ++AC_DEFUN([AM_PATH_GPGME_PTHREAD], ++[ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl ++ tmp=ifelse([$1], ,1:0.4.2,$1) ++ if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then ++ req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` ++ min_gpgme_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` ++ else ++ req_gpgme_api=0 ++ min_gpgme_version="$tmp" ++ fi ++ ++ AC_MSG_CHECKING(for GPGME pthread - version >= $min_gpgme_version) ++ ok=no ++ if test "$GPGME_CONFIG" != "no" ; then ++ if `$GPGME_CONFIG --thread=pthread 2> /dev/null` ; then ++ req_major=`echo $min_gpgme_version | \ ++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` ++ req_minor=`echo $min_gpgme_version | \ ++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` ++ req_micro=`echo $min_gpgme_version | \ ++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` ++ if test "$gpgme_version_major" -gt "$req_major"; then ++ ok=yes ++ else ++ if test "$gpgme_version_major" -eq "$req_major"; then ++ if test "$gpgme_version_minor" -gt "$req_minor"; then ++ ok=yes ++ else ++ if test "$gpgme_version_minor" -eq "$req_minor"; then ++ if test "$gpgme_version_micro" -ge "$req_micro"; then ++ ok=yes ++ fi ++ fi ++ fi ++ fi ++ fi ++ fi ++ fi ++ if test $ok = yes; then ++ # If we have a recent GPGME, we should also check that the ++ # API is compatible. ++ if test "$req_gpgme_api" -gt 0 ; then ++ tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` ++ if test "$tmp" -gt 0 ; then ++ if test "$req_gpgme_api" -ne "$tmp" ; then ++ ok=no ++ fi ++ fi ++ fi ++ fi ++ if test $ok = yes; then ++ GPGME_PTHREAD_CFLAGS=`$GPGME_CONFIG --thread=pthread --cflags` ++ GPGME_PTHREAD_LIBS=`$GPGME_CONFIG --thread=pthread --libs` ++ AC_MSG_RESULT(yes) ++ ifelse([$2], , :, [$2]) ++ else ++ GPGME_PTHREAD_CFLAGS="" ++ GPGME_PTHREAD_LIBS="" ++ AC_MSG_RESULT(no) ++ ifelse([$3], , :, [$3]) ++ fi ++ AC_SUBST(GPGME_PTHREAD_CFLAGS) ++ AC_SUBST(GPGME_PTHREAD_LIBS) ++]) ++ ++ ++dnl AM_PATH_GPGME_GLIB([MINIMUM-VERSION, ++dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) ++dnl Test for libgpgme-glib and define GPGME_GLIB_CFLAGS and GPGME_GLIB_LIBS. ++dnl ++AC_DEFUN([AM_PATH_GPGME_GLIB], ++[ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl ++ tmp=ifelse([$1], ,1:0.4.2,$1) ++ if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then ++ req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` ++ min_gpgme_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` ++ else ++ req_gpgme_api=0 ++ min_gpgme_version="$tmp" ++ fi ++ ++ AC_MSG_CHECKING(for GPGME - version >= $min_gpgme_version) ++ ok=no ++ if test "$GPGME_CONFIG" != "no" ; then ++ req_major=`echo $min_gpgme_version | \ ++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` ++ req_minor=`echo $min_gpgme_version | \ ++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` ++ req_micro=`echo $min_gpgme_version | \ ++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` ++ if test "$gpgme_version_major" -gt "$req_major"; then ++ ok=yes ++ else ++ if test "$gpgme_version_major" -eq "$req_major"; then ++ if test "$gpgme_version_minor" -gt "$req_minor"; then ++ ok=yes ++ else ++ if test "$gpgme_version_minor" -eq "$req_minor"; then ++ if test "$gpgme_version_micro" -ge "$req_micro"; then ++ ok=yes ++ fi ++ fi ++ fi ++ fi ++ fi ++ fi ++ if test $ok = yes; then ++ # If we have a recent GPGME, we should also check that the ++ # API is compatible. ++ if test "$req_gpgme_api" -gt 0 ; then ++ tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` ++ if test "$tmp" -gt 0 ; then ++ if test "$req_gpgme_api" -ne "$tmp" ; then ++ ok=no ++ fi ++ fi ++ fi ++ fi ++ if test $ok = yes; then ++ GPGME_GLIB_CFLAGS=`$GPGME_CONFIG --glib --cflags` ++ GPGME_GLIB_LIBS=`$GPGME_CONFIG --glib --libs` ++ AC_MSG_RESULT(yes) ++ ifelse([$2], , :, [$2]) ++ else ++ GPGME_GLIB_CFLAGS="" ++ GPGME_GLIB_LIBS="" ++ AC_MSG_RESULT(no) ++ ifelse([$3], , :, [$3]) ++ fi ++ AC_SUBST(GPGME_GLIB_CFLAGS) ++ AC_SUBST(GPGME_GLIB_LIBS) ++]) ++ +diff -r 710654b6b85f -r f36d60bed54b mcabber/macros/libgcrypt.m4 +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ b/mcabber/macros/libgcrypt.m4 Fri Dec 14 18:32:36 2012 +0100 +@@ -0,0 +1,123 @@ ++dnl Autoconf macros for libgcrypt ++dnl Copyright (C) 2002, 2004 Free Software Foundation, Inc. ++dnl ++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 modifications, as long as this notice is preserved. ++dnl ++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 implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ++ ++ ++dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION, ++dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) ++dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS. ++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 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 this features allows to prevent build against newer versions of libgcrypt ++dnl with a changed API. ++dnl ++AC_DEFUN([AM_PATH_LIBGCRYPT], ++[ AC_ARG_WITH(libgcrypt-prefix, ++ AC_HELP_STRING([--with-libgcrypt-prefix=PFX], ++ [prefix where LIBGCRYPT is installed (optional)]), ++ libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="") ++ if test x$libgcrypt_config_prefix != x ; then ++ if test x${LIBGCRYPT_CONFIG+set} != xset ; then ++ LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config ++ fi ++ fi ++ ++ AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no) ++ tmp=ifelse([$1], ,1:1.2.0,$1) ++ if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then ++ req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` ++ min_libgcrypt_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` ++ else ++ req_libgcrypt_api=0 ++ min_libgcrypt_version="$tmp" ++ fi ++ ++ AC_MSG_CHECKING(for LIBGCRYPT - version >= $min_libgcrypt_version) ++ ok=no ++ if test "$LIBGCRYPT_CONFIG" != "no" ; then ++ req_major=`echo $min_libgcrypt_version | \ ++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` ++ req_minor=`echo $min_libgcrypt_version | \ ++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` ++ req_micro=`echo $min_libgcrypt_version | \ ++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` ++ libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version` ++ major=`echo $libgcrypt_config_version | \ ++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` ++ minor=`echo $libgcrypt_config_version | \ ++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` ++ micro=`echo $libgcrypt_config_version | \ ++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'` ++ if test "$major" -gt "$req_major"; then ++ ok=yes ++ else ++ if test "$major" -eq "$req_major"; then ++ if test "$minor" -gt "$req_minor"; then ++ ok=yes ++ else ++ if test "$minor" -eq "$req_minor"; then ++ if test "$micro" -ge "$req_micro"; then ++ ok=yes ++ fi ++ fi ++ fi ++ fi ++ fi ++ fi ++ if test $ok = yes; then ++ AC_MSG_RESULT([yes ($libgcrypt_config_version)]) ++ else ++ AC_MSG_RESULT(no) ++ fi ++ if test $ok = yes; then ++ # If we have a recent libgcrypt, we should also check that the ++ # API is compatible ++ if test "$req_libgcrypt_api" -gt 0 ; then ++ tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0` ++ if test "$tmp" -gt 0 ; then ++ AC_MSG_CHECKING([LIBGCRYPT API version]) ++ if test "$req_libgcrypt_api" -eq "$tmp" ; then ++ AC_MSG_RESULT([okay]) ++ else ++ ok=no ++ AC_MSG_RESULT([does not match. want=$req_libgcrypt_api got=$tmp]) ++ fi ++ fi ++ fi ++ fi ++ if test $ok = yes; then ++ LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` ++ LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs` ++ ifelse([$2], , :, [$2]) ++ if test x"$host" != x ; then ++ libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none` ++ if test x"$libgcrypt_config_host" != xnone ; then ++ if test x"$libgcrypt_config_host" != x"$host" ; then ++ AC_MSG_WARN([[ ++*** ++*** The config script $LIBGCRYPT_CONFIG was ++*** built for $libgcrypt_config_host and thus may not match the ++*** used host $host. ++*** You may want to use the configure option --with-libgcrypt-prefix ++*** to specify a matching config script. ++***]]) ++ fi ++ fi ++ fi ++ else ++ LIBGCRYPT_CFLAGS="" ++ LIBGCRYPT_LIBS="" ++ ifelse([$3], , :, [$3]) ++ fi ++ AC_SUBST(LIBGCRYPT_CFLAGS) ++ AC_SUBST(LIBGCRYPT_LIBS) ++]) +diff -r 710654b6b85f -r f36d60bed54b mcabber/macros/libotr.m4 +--- /dev/null Thu Jan 01 00:00:00 1970 +0000 ++++ b/mcabber/macros/libotr.m4 Fri Dec 14 18:32:36 2012 +0100 +@@ -0,0 +1,134 @@ ++dnl ++dnl Off-the-Record Messaging library ++dnl Copyright (C) 2004-2007 Ian Goldberg, Chris Alexander, Nikita Borisov ++dnl ++dnl ++dnl This library is free software; you can redistribute it and/or ++dnl modify it under the terms of version 2.1 of the GNU Lesser General ++dnl Public License as published by the Free Software Foundation. ++dnl ++dnl This library is distributed in the hope that it will be useful, ++dnl but WITHOUT ANY WARRANTY; without even the implied warranty of ++dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++dnl Lesser General Public License for more details. ++dnl ++dnl You should have received a copy of the GNU Lesser General Public ++dnl License along with this library; if not, write to the Free Software ++dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++dnl ++ ++dnl AM_PATH_LIBOTR([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) ++dnl Test for libotr, and define LIBOTR_CFLAGS and LIBOTR_LIBS as appropriate. ++dnl enables arguments --with-libotr-prefix= ++dnl --with-libotr-inc-prefix= ++dnl ++dnl You must already have found libgcrypt with AM_PATH_LIBGCRYPT ++dnl ++dnl Adapted from alsa.m4, originally by ++dnl Richard Boulton ++dnl Christopher Lansdown ++dnl Jaroslav Kysela ++ ++AC_DEFUN([AM_PATH_LIBOTR], ++[dnl Save the original CFLAGS, LDFLAGS, and LIBS ++libotr_save_CFLAGS="$CFLAGS" ++libotr_save_LDFLAGS="$LDFLAGS" ++libotr_save_LIBS="$LIBS" ++libotr_found=yes ++ ++dnl ++dnl Get the cflags and libraries for libotr ++dnl ++AC_ARG_WITH(libotr-prefix, ++[ --with-libotr-prefix=PFX prefix where libotr is installed (optional)], ++[libotr_prefix="$withval"], [libotr_prefix=""]) ++ ++AC_ARG_WITH(libotr-inc-prefix, ++[ --with-libotr-inc-prefix=PFX prefix where libotr includes are (optional)], ++[libotr_inc_prefix="$withval"], [libotr_inc_prefix=""]) ++ ++dnl Add any special include directories ++AC_MSG_CHECKING(for libotr CFLAGS) ++if test "$libotr_inc_prefix" != "" ; then ++ LIBOTR_CFLAGS="$LIBOTR_CFLAGS -I$libotr_inc_prefix" ++ CFLAGS="$CFLAGS $LIBOTR_CFLAGS" ++fi ++AC_MSG_RESULT($LIBOTR_CFLAGS) ++ ++dnl add any special lib dirs ++AC_MSG_CHECKING(for libotr LIBS) ++if test "$libotr_prefix" != "" ; then ++ LIBOTR_LIBS="$LIBOTR_LIBS -L$libotr_prefix" ++ LDFLAGS="$LDFLAGS $LIBOTR_LIBS" ++fi ++ ++dnl add the libotr library ++LIBOTR_LIBS="$LIBOTR_LIBS -lotr" ++LIBS="$LIBOTR_LIBS $LIBS" ++AC_MSG_RESULT($LIBOTR_LIBS) ++ ++dnl Check for a working version of libotr that is of the right version. ++min_libotr_version=ifelse([$1], ,3.0.0,$1) ++no_libotr="" ++ libotr_min_major_version=`echo $min_libotr_version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` ++ libotr_min_minor_version=`echo $min_libotr_version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` ++ libotr_min_sub_version=`echo $min_libotr_version | \ ++ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` ++AC_MSG_CHECKING(for libotr headers version $libotr_min_major_version.x >= $min_libotr_version) ++ ++AC_LANG_SAVE ++AC_LANG_C ++AC_TRY_COMPILE([ ++#include ++#include ++], [ ++# if(OTRL_VERSION_MAJOR != $libotr_min_major_version) ++# error not present ++# else ++ ++# if(OTRL_VERSION_MINOR > $libotr_min_minor_version) ++ exit(0); ++# else ++# if(OTRL_VERSION_MINOR < $libotr_min_minor_version) ++# error not present ++# endif ++ ++# if(OTRL_VERSION_SUB < $libotr_min_sub_version) ++# error not present ++# endif ++# endif ++# endif ++exit(0); ++], ++ [AC_MSG_RESULT(found.)], ++ [AC_MSG_RESULT(not present.) ++ ifelse([$3], , [AC_MSG_ERROR(Sufficiently new version of libotr not found.)]) ++ libotr_found=no] ++) ++AC_LANG_RESTORE ++ ++dnl Now that we know that we have the right version, let's see if we have the library and not just the headers. ++AC_CHECK_LIB([otr], [otrl_message_receiving],, ++ [ifelse([$3], , [AC_MSG_ERROR(No linkable libotr was found.)]) ++ libotr_found=no], ++ $LIBGCRYPT_LIBS ++) ++ ++LDFLAGS="$libotr_save_LDFLAGS" ++LIBS="$libotr_save_LIBS" ++ ++if test "x$libotr_found" = "xyes" ; then ++ ifelse([$2], , :, [$2]) ++else ++ LIBOTR_CFLAGS="" ++ LIBOTR_LIBS="" ++ ifelse([$3], , :, [$3]) ++fi ++ ++dnl That should be it. Now just export our symbols: ++AC_SUBST(LIBOTR_CFLAGS) ++AC_SUBST(LIBOTR_LIBS) ++]) ++ +diff -r 710654b6b85f -r f36d60bed54b mcabber/macros/missing/glib-2.0.m4 +--- a/mcabber/macros/missing/glib-2.0.m4 Sun Dec 02 14:58:19 2012 +0100 ++++ /dev/null Thu Jan 01 00:00:00 1970 +0000 +@@ -1,208 +0,0 @@ +-# Configure paths for GLIB +-# Owen Taylor 1997-2001 +- +-dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) +-dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject or +-dnl gthread is specified in MODULES, pass to pkg-config +-dnl +-AC_DEFUN([AM_PATH_GLIB_2_0], +-[dnl +-dnl Get the cflags and libraries from pkg-config +-dnl +-AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], +- , enable_glibtest=yes) +- +- pkg_config_args=glib-2.0 +- for module in . $4 +- do +- case "$module" in +- gmodule) +- pkg_config_args="$pkg_config_args gmodule-2.0" +- ;; +- gmodule-no-export) +- pkg_config_args="$pkg_config_args gmodule-no-export-2.0" +- ;; +- gobject) +- pkg_config_args="$pkg_config_args gobject-2.0" +- ;; +- gthread) +- pkg_config_args="$pkg_config_args gthread-2.0" +- ;; +- esac +- done +- +- PKG_PROG_PKG_CONFIG([0.7]) +- +- no_glib="" +- +- if test "x$PKG_CONFIG" = x ; then +- no_glib=yes +- PKG_CONFIG=no +- fi +- +- min_glib_version=ifelse([$1], ,2.0.0,$1) +- AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) +- +- if test x$PKG_CONFIG != xno ; then +- ## don't try to run the test against uninstalled libtool libs +- if $PKG_CONFIG --uninstalled $pkg_config_args; then +- echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" +- enable_glibtest=no +- fi +- +- if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then +- : +- else +- no_glib=yes +- fi +- fi +- +- if test x"$no_glib" = x ; then +- GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` +- GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` +- GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` +- +- GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` +- GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` +- glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ +- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` +- glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ +- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` +- glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ +- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` +- if test "x$enable_glibtest" = "xyes" ; then +- ac_save_CFLAGS="$CFLAGS" +- ac_save_LIBS="$LIBS" +- CFLAGS="$CFLAGS $GLIB_CFLAGS" +- LIBS="$GLIB_LIBS $LIBS" +-dnl +-dnl Now check if the installed GLIB is sufficiently new. (Also sanity +-dnl checks the results of pkg-config to some extent) +-dnl +- rm -f conf.glibtest +- AC_TRY_RUN([ +-#include +-#include +-#include +- +-int +-main () +-{ +- int major, minor, micro; +- char *tmp_version; +- +- system ("touch conf.glibtest"); +- +- /* HP/UX 9 (%@#!) writes to sscanf strings */ +- tmp_version = g_strdup("$min_glib_version"); +- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { +- printf("%s, bad version string\n", "$min_glib_version"); +- exit(1); +- } +- +- if ((glib_major_version != $glib_config_major_version) || +- (glib_minor_version != $glib_config_minor_version) || +- (glib_micro_version != $glib_config_micro_version)) +- { +- printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", +- $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, +- glib_major_version, glib_minor_version, glib_micro_version); +- printf ("*** was found! If pkg-config was correct, then it is best\n"); +- printf ("*** to remove the old version of GLib. 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 pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); +- printf("*** to point to the correct configuration files\n"); +- } +- else if ((glib_major_version != GLIB_MAJOR_VERSION) || +- (glib_minor_version != GLIB_MINOR_VERSION) || +- (glib_micro_version != GLIB_MICRO_VERSION)) +- { +- printf("*** GLIB header files (version %d.%d.%d) do not match\n", +- GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); +- printf("*** library (version %d.%d.%d)\n", +- glib_major_version, glib_minor_version, glib_micro_version); +- } +- else +- { +- if ((glib_major_version > major) || +- ((glib_major_version == major) && (glib_minor_version > minor)) || +- ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) +- { +- return 0; +- } +- else +- { +- printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", +- glib_major_version, glib_minor_version, glib_micro_version); +- printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", +- major, minor, micro); +- printf("*** GLIB is always available from ftp://ftp.gtk.org.\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 pkg-config shell script is\n"); +- printf("*** being found. The easiest way to fix this is to remove the old version\n"); +- printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); +- printf("*** correct copy of pkg-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_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) +- CFLAGS="$ac_save_CFLAGS" +- LIBS="$ac_save_LIBS" +- fi +- fi +- if test "x$no_glib" = x ; then +- AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) +- ifelse([$2], , :, [$2]) +- else +- AC_MSG_RESULT(no) +- if test "$PKG_CONFIG" = "no" ; then +- echo "*** A new enough version of pkg-config was not found." +- echo "*** See http://www.freedesktop.org/software/pkgconfig/" +- else +- if test -f conf.glibtest ; then +- : +- else +- echo "*** Could not run GLIB test program, checking why..." +- ac_save_CFLAGS="$CFLAGS" +- ac_save_LIBS="$LIBS" +- CFLAGS="$CFLAGS $GLIB_CFLAGS" +- LIBS="$LIBS $GLIB_LIBS" +- AC_TRY_LINK([ +-#include +-#include +-], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], +- [ echo "*** The test program compiled, but did not run. This usually means" +- echo "*** that the run-time linker is not finding GLIB or finding the wrong" +- echo "*** version of GLIB. If it is not finding GLIB, 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 "*** The test program failed to compile or link. See the file config.log for the" +- echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) +- CFLAGS="$ac_save_CFLAGS" +- LIBS="$ac_save_LIBS" +- fi +- fi +- GLIB_CFLAGS="" +- GLIB_LIBS="" +- GLIB_GENMARSHAL="" +- GOBJECT_QUERY="" +- GLIB_MKENUMS="" +- ifelse([$3], , :, [$3]) +- fi +- AC_SUBST(GLIB_CFLAGS) +- AC_SUBST(GLIB_LIBS) +- AC_SUBST(GLIB_GENMARSHAL) +- AC_SUBST(GOBJECT_QUERY) +- AC_SUBST(GLIB_MKENUMS) +- rm -f conf.glibtest +-]) +diff -r 710654b6b85f -r f36d60bed54b mcabber/macros/missing/gpgme.m4 +--- a/mcabber/macros/missing/gpgme.m4 Sun Dec 02 14:58:19 2012 +0100 ++++ /dev/null Thu Jan 01 00:00:00 1970 +0000 +@@ -1,307 +0,0 @@ +-# gpgme.m4 - autoconf macro to detect GPGME. +-# Copyright (C) 2002, 2003, 2004 g10 Code GmbH +-# +-# This file is free software; as a special exception the author gives +-# unlimited permission to copy and/or distribute it, with or without +-# modifications, as long as this notice is preserved. +-# +-# This file is distributed in the hope that it will be useful, but +-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +- +- +-AC_DEFUN([_AM_PATH_GPGME_CONFIG], +-[ AC_ARG_WITH(gpgme-prefix, +- AC_HELP_STRING([--with-gpgme-prefix=PFX], +- [prefix where GPGME is installed (optional)]), +- gpgme_config_prefix="$withval", gpgme_config_prefix="") +- if test "x$gpgme_config_prefix" != x ; then +- GPGME_CONFIG="$gpgme_config_prefix/bin/gpgme-config" +- fi +- AC_PATH_PROG(GPGME_CONFIG, gpgme-config, no) +- +- if test "$GPGME_CONFIG" != "no" ; then +- gpgme_version=`$GPGME_CONFIG --version` +- fi +- gpgme_version_major=`echo $gpgme_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` +- gpgme_version_minor=`echo $gpgme_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` +- gpgme_version_micro=`echo $gpgme_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'` +-]) +- +-dnl AM_PATH_GPGME([MINIMUM-VERSION, +-dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) +-dnl Test for libgpgme and define GPGME_CFLAGS and GPGME_LIBS. +-dnl +-AC_DEFUN([AM_PATH_GPGME], +-[ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl +- tmp=ifelse([$1], ,1:0.4.2,$1) +- if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then +- req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` +- min_gpgme_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` +- else +- req_gpgme_api=0 +- min_gpgme_version="$tmp" +- fi +- +- AC_MSG_CHECKING(for GPGME - version >= $min_gpgme_version) +- ok=no +- if test "$GPGME_CONFIG" != "no" ; then +- req_major=`echo $min_gpgme_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` +- req_minor=`echo $min_gpgme_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` +- req_micro=`echo $min_gpgme_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` +- if test "$gpgme_version_major" -gt "$req_major"; then +- ok=yes +- else +- if test "$gpgme_version_major" -eq "$req_major"; then +- if test "$gpgme_version_minor" -gt "$req_minor"; then +- ok=yes +- else +- if test "$gpgme_version_minor" -eq "$req_minor"; then +- if test "$gpgme_version_micro" -ge "$req_micro"; then +- ok=yes +- fi +- fi +- fi +- fi +- fi +- fi +- if test $ok = yes; then +- # If we have a recent GPGME, we should also check that the +- # API is compatible. +- if test "$req_gpgme_api" -gt 0 ; then +- tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` +- if test "$tmp" -gt 0 ; then +- if test "$req_gpgme_api" -ne "$tmp" ; then +- ok=no +- fi +- fi +- fi +- fi +- if test $ok = yes; then +- GPGME_CFLAGS=`$GPGME_CONFIG --cflags` +- GPGME_LIBS=`$GPGME_CONFIG --libs` +- AC_MSG_RESULT(yes) +- ifelse([$2], , :, [$2]) +- else +- GPGME_CFLAGS="" +- GPGME_LIBS="" +- AC_MSG_RESULT(no) +- ifelse([$3], , :, [$3]) +- fi +- AC_SUBST(GPGME_CFLAGS) +- AC_SUBST(GPGME_LIBS) +-]) +- +-dnl AM_PATH_GPGME_PTH([MINIMUM-VERSION, +-dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) +-dnl Test for libgpgme and define GPGME_PTH_CFLAGS and GPGME_PTH_LIBS. +-dnl +-AC_DEFUN([AM_PATH_GPGME_PTH], +-[ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl +- tmp=ifelse([$1], ,1:0.4.2,$1) +- if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then +- req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` +- min_gpgme_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` +- else +- req_gpgme_api=0 +- min_gpgme_version="$tmp" +- fi +- +- AC_MSG_CHECKING(for GPGME Pth - version >= $min_gpgme_version) +- ok=no +- if test "$GPGME_CONFIG" != "no" ; then +- if `$GPGME_CONFIG --thread=pth 2> /dev/null` ; then +- req_major=`echo $min_gpgme_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` +- req_minor=`echo $min_gpgme_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` +- req_micro=`echo $min_gpgme_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` +- if test "$gpgme_version_major" -gt "$req_major"; then +- ok=yes +- else +- if test "$gpgme_version_major" -eq "$req_major"; then +- if test "$gpgme_version_minor" -gt "$req_minor"; then +- ok=yes +- else +- if test "$gpgme_version_minor" -eq "$req_minor"; then +- if test "$gpgme_version_micro" -ge "$req_micro"; then +- ok=yes +- fi +- fi +- fi +- fi +- fi +- fi +- fi +- if test $ok = yes; then +- # If we have a recent GPGME, we should also check that the +- # API is compatible. +- if test "$req_gpgme_api" -gt 0 ; then +- tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` +- if test "$tmp" -gt 0 ; then +- if test "$req_gpgme_api" -ne "$tmp" ; then +- ok=no +- fi +- fi +- fi +- fi +- if test $ok = yes; then +- GPGME_PTH_CFLAGS=`$GPGME_CONFIG --thread=pth --cflags` +- GPGME_PTH_LIBS=`$GPGME_CONFIG --thread=pth --libs` +- AC_MSG_RESULT(yes) +- ifelse([$2], , :, [$2]) +- else +- GPGME_PTH_CFLAGS="" +- GPGME_PTH_LIBS="" +- AC_MSG_RESULT(no) +- ifelse([$3], , :, [$3]) +- fi +- AC_SUBST(GPGME_PTH_CFLAGS) +- AC_SUBST(GPGME_PTH_LIBS) +-]) +- +-dnl AM_PATH_GPGME_PTHREAD([MINIMUM-VERSION, +-dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) +-dnl Test for libgpgme and define GPGME_PTHREAD_CFLAGS +-dnl and GPGME_PTHREAD_LIBS. +-dnl +-AC_DEFUN([AM_PATH_GPGME_PTHREAD], +-[ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl +- tmp=ifelse([$1], ,1:0.4.2,$1) +- if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then +- req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` +- min_gpgme_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` +- else +- req_gpgme_api=0 +- min_gpgme_version="$tmp" +- fi +- +- AC_MSG_CHECKING(for GPGME pthread - version >= $min_gpgme_version) +- ok=no +- if test "$GPGME_CONFIG" != "no" ; then +- if `$GPGME_CONFIG --thread=pthread 2> /dev/null` ; then +- req_major=`echo $min_gpgme_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` +- req_minor=`echo $min_gpgme_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` +- req_micro=`echo $min_gpgme_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` +- if test "$gpgme_version_major" -gt "$req_major"; then +- ok=yes +- else +- if test "$gpgme_version_major" -eq "$req_major"; then +- if test "$gpgme_version_minor" -gt "$req_minor"; then +- ok=yes +- else +- if test "$gpgme_version_minor" -eq "$req_minor"; then +- if test "$gpgme_version_micro" -ge "$req_micro"; then +- ok=yes +- fi +- fi +- fi +- fi +- fi +- fi +- fi +- if test $ok = yes; then +- # If we have a recent GPGME, we should also check that the +- # API is compatible. +- if test "$req_gpgme_api" -gt 0 ; then +- tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` +- if test "$tmp" -gt 0 ; then +- if test "$req_gpgme_api" -ne "$tmp" ; then +- ok=no +- fi +- fi +- fi +- fi +- if test $ok = yes; then +- GPGME_PTHREAD_CFLAGS=`$GPGME_CONFIG --thread=pthread --cflags` +- GPGME_PTHREAD_LIBS=`$GPGME_CONFIG --thread=pthread --libs` +- AC_MSG_RESULT(yes) +- ifelse([$2], , :, [$2]) +- else +- GPGME_PTHREAD_CFLAGS="" +- GPGME_PTHREAD_LIBS="" +- AC_MSG_RESULT(no) +- ifelse([$3], , :, [$3]) +- fi +- AC_SUBST(GPGME_PTHREAD_CFLAGS) +- AC_SUBST(GPGME_PTHREAD_LIBS) +-]) +- +- +-dnl AM_PATH_GPGME_GLIB([MINIMUM-VERSION, +-dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) +-dnl Test for libgpgme-glib and define GPGME_GLIB_CFLAGS and GPGME_GLIB_LIBS. +-dnl +-AC_DEFUN([AM_PATH_GPGME_GLIB], +-[ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl +- tmp=ifelse([$1], ,1:0.4.2,$1) +- if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then +- req_gpgme_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` +- min_gpgme_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` +- else +- req_gpgme_api=0 +- min_gpgme_version="$tmp" +- fi +- +- AC_MSG_CHECKING(for GPGME - version >= $min_gpgme_version) +- ok=no +- if test "$GPGME_CONFIG" != "no" ; then +- req_major=`echo $min_gpgme_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` +- req_minor=`echo $min_gpgme_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` +- req_micro=`echo $min_gpgme_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` +- if test "$gpgme_version_major" -gt "$req_major"; then +- ok=yes +- else +- if test "$gpgme_version_major" -eq "$req_major"; then +- if test "$gpgme_version_minor" -gt "$req_minor"; then +- ok=yes +- else +- if test "$gpgme_version_minor" -eq "$req_minor"; then +- if test "$gpgme_version_micro" -ge "$req_micro"; then +- ok=yes +- fi +- fi +- fi +- fi +- fi +- fi +- if test $ok = yes; then +- # If we have a recent GPGME, we should also check that the +- # API is compatible. +- if test "$req_gpgme_api" -gt 0 ; then +- tmp=`$GPGME_CONFIG --api-version 2>/dev/null || echo 0` +- if test "$tmp" -gt 0 ; then +- if test "$req_gpgme_api" -ne "$tmp" ; then +- ok=no +- fi +- fi +- fi +- fi +- if test $ok = yes; then +- GPGME_GLIB_CFLAGS=`$GPGME_CONFIG --glib --cflags` +- GPGME_GLIB_LIBS=`$GPGME_CONFIG --glib --libs` +- AC_MSG_RESULT(yes) +- ifelse([$2], , :, [$2]) +- else +- GPGME_GLIB_CFLAGS="" +- GPGME_GLIB_LIBS="" +- AC_MSG_RESULT(no) +- ifelse([$3], , :, [$3]) +- fi +- AC_SUBST(GPGME_GLIB_CFLAGS) +- AC_SUBST(GPGME_GLIB_LIBS) +-]) +- +diff -r 710654b6b85f -r f36d60bed54b mcabber/macros/missing/libgcrypt.m4 +--- a/mcabber/macros/missing/libgcrypt.m4 Sun Dec 02 14:58:19 2012 +0100 ++++ /dev/null Thu Jan 01 00:00:00 1970 +0000 +@@ -1,108 +0,0 @@ +-dnl Autoconf macros for libgcrypt +-dnl Copyright (C) 2002, 2004 Free Software Foundation, Inc. +-dnl +-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 modifications, as long as this notice is preserved. +-dnl +-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 implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +- +- +-dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION, +-dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) +-dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS. +-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 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 this features allows to prevent build against newer versions of libgcrypt +-dnl with a changed API. +-dnl +-AC_DEFUN([AM_PATH_LIBGCRYPT], +-[ AC_ARG_WITH(libgcrypt-prefix, +- AC_HELP_STRING([--with-libgcrypt-prefix=PFX], +- [prefix where LIBGCRYPT is installed (optional)]), +- libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="") +- if test x$libgcrypt_config_prefix != x ; then +- if test x${LIBGCRYPT_CONFIG+set} != xset ; then +- LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config +- fi +- fi +- +- AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no) +- tmp=ifelse([$1], ,1:1.2.0,$1) +- if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then +- req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` +- min_libgcrypt_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` +- else +- req_libgcrypt_api=0 +- min_libgcrypt_version="$tmp" +- fi +- +- AC_MSG_CHECKING(for LIBGCRYPT - version >= $min_libgcrypt_version) +- ok=no +- if test "$LIBGCRYPT_CONFIG" != "no" ; then +- req_major=`echo $min_libgcrypt_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` +- req_minor=`echo $min_libgcrypt_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` +- req_micro=`echo $min_libgcrypt_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` +- libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version` +- major=`echo $libgcrypt_config_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` +- minor=`echo $libgcrypt_config_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` +- micro=`echo $libgcrypt_config_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'` +- if test "$major" -gt "$req_major"; then +- ok=yes +- else +- if test "$major" -eq "$req_major"; then +- if test "$minor" -gt "$req_minor"; then +- ok=yes +- else +- if test "$minor" -eq "$req_minor"; then +- if test "$micro" -ge "$req_micro"; then +- ok=yes +- fi +- fi +- fi +- fi +- fi +- fi +- if test $ok = yes; then +- AC_MSG_RESULT(yes) +- else +- AC_MSG_RESULT(no) +- fi +- if test $ok = yes; then +- # If we have a recent libgcrypt, we should also check that the +- # API is compatible +- if test "$req_libgcrypt_api" -gt 0 ; then +- tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0` +- if test "$tmp" -gt 0 ; then +- AC_MSG_CHECKING([LIBGCRYPT API version]) +- if test "$req_libgcrypt_api" -eq "$tmp" ; then +- AC_MSG_RESULT(okay) +- else +- ok=no +- AC_MSG_RESULT([does not match (want=$req_libgcrypt_api got=$tmp)]) +- fi +- fi +- fi +- fi +- if test $ok = yes; then +- LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` +- LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs` +- ifelse([$2], , :, [$2]) +- else +- LIBGCRYPT_CFLAGS="" +- LIBGCRYPT_LIBS="" +- ifelse([$3], , :, [$3]) +- fi +- AC_SUBST(LIBGCRYPT_CFLAGS) +- AC_SUBST(LIBGCRYPT_LIBS) +-]) +diff -r 710654b6b85f -r f36d60bed54b mcabber/macros/missing/libotr.m4 +--- a/mcabber/macros/missing/libotr.m4 Sun Dec 02 14:58:19 2012 +0100 ++++ /dev/null Thu Jan 01 00:00:00 1970 +0000 +@@ -1,134 +0,0 @@ +-dnl +-dnl Off-the-Record Messaging library +-dnl Copyright (C) 2004-2007 Ian Goldberg, Chris Alexander, Nikita Borisov +-dnl +-dnl +-dnl This library is free software; you can redistribute it and/or +-dnl modify it under the terms of version 2.1 of the GNU Lesser General +-dnl Public License as published by the Free Software Foundation. +-dnl +-dnl This library is distributed in the hope that it will be useful, +-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-dnl Lesser General Public License for more details. +-dnl +-dnl You should have received a copy of the GNU Lesser General Public +-dnl License along with this library; if not, write to the Free Software +-dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +-dnl +- +-dnl AM_PATH_LIBOTR([MINIMUM-VERSION [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +-dnl Test for libotr, and define LIBOTR_CFLAGS and LIBOTR_LIBS as appropriate. +-dnl enables arguments --with-libotr-prefix= +-dnl --with-libotr-inc-prefix= +-dnl +-dnl You must already have found libgcrypt with AM_PATH_LIBGCRYPT +-dnl +-dnl Adapted from alsa.m4, originally by +-dnl Richard Boulton +-dnl Christopher Lansdown +-dnl Jaroslav Kysela +- +-AC_DEFUN([AM_PATH_LIBOTR], +-[dnl Save the original CFLAGS, LDFLAGS, and LIBS +-libotr_save_CFLAGS="$CFLAGS" +-libotr_save_LDFLAGS="$LDFLAGS" +-libotr_save_LIBS="$LIBS" +-libotr_found=yes +- +-dnl +-dnl Get the cflags and libraries for libotr +-dnl +-AC_ARG_WITH(libotr-prefix, +-[ --with-libotr-prefix=PFX prefix where libotr is installed (optional)], +-[libotr_prefix="$withval"], [libotr_prefix=""]) +- +-AC_ARG_WITH(libotr-inc-prefix, +-[ --with-libotr-inc-prefix=PFX prefix where libotr includes are (optional)], +-[libotr_inc_prefix="$withval"], [libotr_inc_prefix=""]) +- +-dnl Add any special include directories +-AC_MSG_CHECKING(for libotr CFLAGS) +-if test "$libotr_inc_prefix" != "" ; then +- LIBOTR_CFLAGS="$LIBOTR_CFLAGS -I$libotr_inc_prefix" +- CFLAGS="$CFLAGS $LIBOTR_CFLAGS" +-fi +-AC_MSG_RESULT($LIBOTR_CFLAGS) +- +-dnl add any special lib dirs +-AC_MSG_CHECKING(for libotr LIBS) +-if test "$libotr_prefix" != "" ; then +- LIBOTR_LIBS="$LIBOTR_LIBS -L$libotr_prefix" +- LDFLAGS="$LDFLAGS $LIBOTR_LIBS" +-fi +- +-dnl add the libotr library +-LIBOTR_LIBS="$LIBOTR_LIBS -lotr" +-LIBS="$LIBOTR_LIBS $LIBS" +-AC_MSG_RESULT($LIBOTR_LIBS) +- +-dnl Check for a working version of libotr that is of the right version. +-min_libotr_version=ifelse([$1], ,3.0.0,$1) +-no_libotr="" +- libotr_min_major_version=`echo $min_libotr_version | \ +- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` +- libotr_min_minor_version=`echo $min_libotr_version | \ +- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` +- libotr_min_sub_version=`echo $min_libotr_version | \ +- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` +-AC_MSG_CHECKING(for libotr headers version $libotr_min_major_version.x >= $min_libotr_version) +- +-AC_LANG_SAVE +-AC_LANG_C +-AC_TRY_COMPILE([ +-#include +-#include +-], [ +-# if(OTRL_VERSION_MAJOR != $libotr_min_major_version) +-# error not present +-# else +- +-# if(OTRL_VERSION_MINOR > $libotr_min_minor_version) +- exit(0); +-# else +-# if(OTRL_VERSION_MINOR < $libotr_min_minor_version) +-# error not present +-# endif +- +-# if(OTRL_VERSION_SUB < $libotr_min_sub_version) +-# error not present +-# endif +-# endif +-# endif +-exit(0); +-], +- [AC_MSG_RESULT(found.)], +- [AC_MSG_RESULT(not present.) +- ifelse([$3], , [AC_MSG_ERROR(Sufficiently new version of libotr not found.)]) +- libotr_found=no] +-) +-AC_LANG_RESTORE +- +-dnl Now that we know that we have the right version, let's see if we have the library and not just the headers. +-AC_CHECK_LIB([otr], [otrl_message_receiving],, +- [ifelse([$3], , [AC_MSG_ERROR(No linkable libotr was found.)]) +- libotr_found=no], +- $LIBGCRYPT_LIBS +-) +- +-LDFLAGS="$libotr_save_LDFLAGS" +-LIBS="$libotr_save_LIBS" +- +-if test "x$libotr_found" = "xyes" ; then +- ifelse([$2], , :, [$2]) +-else +- LIBOTR_CFLAGS="" +- LIBOTR_LIBS="" +- ifelse([$3], , :, [$3]) +-fi +- +-dnl That should be it. Now just export our symbols: +-AC_SUBST(LIBOTR_CFLAGS) +-AC_SUBST(LIBOTR_LIBS) +-]) +- + diff -Naur a/net-im/mcabber/Manifest b/net-im/mcabber/Manifest --- a/net-im/mcabber/Manifest 2013-01-28 15:42:51.789339921 +0100 +++ b/net-im/mcabber/Manifest 2013-01-28 15:42:39.226340032 +0100 @@ -1,8 +1,9 @@ +AUX fix-without-otr.patch 58002 SHA256 d06a4d10b3001b54ea300bfe4f95700bc8a9f70bd4ffa11bb9a092479c29c309 SHA512 367315052c6d9a051a786bc2344dfff1e0770239769045894627a0cde644150c1ed9768ad5598343df0d7513a582da3672fa0ea37cdcd22df9dcdf37fdad659b WHIRLPOOL 70be58b3b2bb3c6a4e1b508d811a656b5fc990e160b7416760779790dba7f9370973ac3d5b0b25a7308f6bce5a54b1a0782d222805ab9312f458060a26c79ca2 DIST mcabber-0.10.0.tar.bz2 552111 SHA256 ef1bb95238a32f841c6e7032550b40197643843b6e459f44ad53c558f5d75c03 DIST mcabber-0.10.1.tar.bz2 554682 SHA256 00cb9c0b272a44559c4207fe37ecd43c5cdff88d1e3a0ed2ba5eec10d9638888 SHA512 2117fe1f9af3d8b4722fbbdab379d941fd19409a5eac05641820bf75682aaeae194577ad8357c37fd11038ed22aeafa545a121df0a87e6b0915ef83a06af0489 WHIRLPOOL 864950a1c8017216bf893b953adbf81d138d2ef1820d6758eb76abb139623c23f026418cad6bcf135f7f5f615bac55194e1d9db9f329bfb89fe4e965d09fdb98 DIST mcabber-0.10.2.tar.bz2 604378 SHA256 e246d153f93a75b4f45879f447434db070503c9903bf3f995af396b3b94586f8 SHA512 976c29ec753a364392ba6b5280c9031d9eb8884236b7d07fbeaa69a731806706f72b93a0bbbca1eca4f11325412d5beff62b14d94acca912841b8b820c2b3652 WHIRLPOOL b448d34025c2e8eb67ff7ccbfe831bbefd609c436ae83516d96060afaba2053a984dfb0aaf2607216b4868c9d05536001b36ee0a4c910c5ce134c0f623d12c04 EBUILD mcabber-0.10.0-r1.ebuild 3140 SHA256 d9dd831f5187b5cbeba463038546f67903f3750b4a4c82622b6a09ea330f39dc SHA512 0f5986c23f4ae71c0f85a758620e73128669799a2006fe14b4201c1dbfbeeb4ae38d780be3726db990a79b80a3205a783cad37a0df766f8745b89934123775b7 WHIRLPOOL 1270639d013baf303e049faaf3c6ccb8610cbbb12f710b73e44d6048bd7eefcd4dd6b898f4bb9ee76eac6d96c51e0a70d13452b9898cc6f95bf9e43d90a018b1 EBUILD mcabber-0.10.1-r1.ebuild 3102 SHA256 e6771ce233ae6747befa2aa5551bdca0b9ba685dd00f964ca0aa0f5724f6152f SHA512 918bc20dd6c2d01fc82ed612733e81140d3e425fa0594066e40eb3217302c640c578169089b066123e60c38777e9ed844ca31be0f700dfc10c7cb7174400dfd2 WHIRLPOOL b23113c7f3b7b69ca5b951096b45f1e19f00e2016cc24de03911ed743a665ad7bc4d779edeb90a1dc6073b87cf7bbe79bc4429660dfea11dcfb44140b2c89b7a -EBUILD mcabber-0.10.2.ebuild 3141 SHA256 b0d8c2f937e705fb7bf643cfc580fa7f3f6e9d54992977fc7d5edbadc69613cd SHA512 c7cb65d3e7391b478742bc2ce67a1f37e3100c0ed11e8b8b6fad201d069573f9add75652ab406c495f7a2d821f7b6ba53cc73fac757501fe00512d43b6a35bae WHIRLPOOL 7cd7380447d0387731e8f66c6de54a058192b7ad8a2367bc24b24f096e61060093d1593adb532fca003eb8331eac7cc814b3a7fb98762003c81e0e0420571f92 +EBUILD mcabber-0.10.2.ebuild 3185 SHA256 a11d382db24283e07d1570bfcae050caa92c604193acba60eec27bbceb1d6769 SHA512 72289e800322c9fc1aa1d4f539620bca097a114b98e72cdde6ac5d3a00ddf285777f9a42a71c5706a8ee8e0b7f5f090ec3920dabd970f7a46baeaccb0e5a7eed WHIRLPOOL 6d8980c9ad680c195b7eae60717b9fcb75d5bdeeab6f871bd64ee2f9a1ae7a4a8aa4f1e1024565b900688f991ffa64518fa6338e59bd7953594ced13661ee4e7 MISC ChangeLog 8119 SHA256 3da96e5957bcc7307974cbdde234f96d9d9253b022763e9309edb3feba679ac1 SHA512 b4b79ba283812344a6a99925d1416447ff6d83ab07748e9936a36db15ede141cbe8ea0e1d07653a9d9facf6c0de158010d014ecd31a26302389acb515c3c6c19 WHIRLPOOL e038dac85b3d8aab9539e763a3ae7de1dcfbc4dab18feed7e04cc0a0103231e6e7e24b923d1246d75eb929e55487ede070c929358ba7484fc99fea0683758e65 MISC metadata.xml 744 SHA256 d3eac22e4b09b3fb0d21cb7a1f637719d0d0188c6b9bfde2527a02be9cf37371 SHA512 d6221fbd4a64056d06d7a39d1001cf6b4917de0c83721acaf4368c7359773e2cd17400ec8320f9098cfa57379cb4ace9d49a504be30e6c566d967c3000f3b908 WHIRLPOOL 685cc34382c653badcf8d4f97b1664564f988af9e654e002330247defef5f1abe4b16a0b681b6c127f0d657d579e8f9ee2dc0f2100271bbf2aaaa60b8febecd1 diff -Naur a/net-im/mcabber/mcabber-0.10.2.ebuild b/net-im/mcabber/mcabber-0.10.2.ebuild --- a/net-im/mcabber/mcabber-0.10.2.ebuild 2013-01-28 15:42:51.790339921 +0100 +++ b/net-im/mcabber/mcabber-0.10.2.ebuild 2013-01-28 15:42:39.226340032 +0100 @@ -41,6 +41,7 @@ } src_prepare() { + epatch "${FILESDIR}/fix-without-otr.patch" eautoreconf }