Merge tag 'v3.21.71' of git://git.berlios.de/fldigi

Conflicts:
	po/es.po

AUTHORS

@@ -14,6 +14,18 @@ AUTHOR: Remi Chateauneu
 CALLSIGN: F4ECW
 EMAIL: remi (dot) chateauneu (at) gmail [dot] com
 
+AUTHOR: John Douyere
+CALLSIGN: VK2ETA
+EMAIL: vk2eta (at) gmail [dot] com
+
+AUTHOR: Stefan Fendt
+CALLSIGN: DO2SMF
+EMAIL: stefan (at) sfendt [dot] de
+
+AUTHOR: John Phelps
+CALLSIGN: KL4YFD
+EMAIL: kl4yfd (at) gmail [dot] com
+
 All authors can be contacted on the fldigi-devel mailing list:
 
 WWW: http://lists.berlios.de/mailman/listinfo/fldigi-devel

ChangeLog

@@ -1,8 +1,29 @@
 
 
-=Version 3.21.70=
+=Version 3.21.71=
+
+2013-05-06  David Freese  <[email protected]>
+
+	d9e2c6f: About update
+	603e6a7: Wavefile generate
+	4c7ffd7: MT63 mode selection
+	bae6d2c: ARQ server
+
+2013-04-30  Remi Chateauneu  <[email protected]>
+
+	9750f38: xmlrpc-c removal
 
-2013-04-13  David Freese  <[email protected]>
+2013-04-30  David Freese  <[email protected]>
+
+	a2624eb: Signal Browser Colors
+	0bc251a: QRZ query
+	816aea5: Rigsupport
+	54708a2: PO file update
+	6b28784: eQSL url
+	acd5297: PSKMAIL
+
+
+=Version 3.21.70=
 
 	ab4e0f2: Contestia/Olivia
 	45be148: Tabs Colors

configure.ac

@@ -9,7 +9,7 @@ dnl major and minor must be integers; patch may
 dnl contain other characters or be empty
 m4_define(FLDIGI_MAJOR, [3])
 m4_define(FLDIGI_MINOR, [21])
-m4_define(FLDIGI_PATCH, [.70])
+m4_define(FLDIGI_PATCH, [.71])
 m4_define(FLARQ_MAJOR,  [4])
 m4_define(FLARQ_MINOR,  [3])
 m4_define(FLARQ_PATCH,  [.4])

m4/xmlrpc.m4

@@ -1,33 +1,4 @@
-AC_DEFUN([AC_FLDIGI_XMLRPC_CONFIG], [
-  ac_cv_xmlrpc=no
-
-  if test "x$XMLRPC_CFLAGS" != "x" && test "x$XMLRPC_LIBS" != "x"; then
-      ac_cv_xmlrpc=yes
-  else
-      if test "x$XMLRPC_C_CONFIG" = "x"; then
-          AC_PATH_PROG([XMLRPC_C_CONFIG], [xmlrpc-c-config], [no])
-      fi
-      if test "x$XMLRPC_C_CONFIG" != "xno" && $XMLRPC_C_CONFIG c++2 abyss-server; then
-          ac_cv_xmlrpc=yes
-
-          test "x$XMLRPC_CFLAGS" = "x" && XMLRPC_CFLAGS=`$XMLRPC_C_CONFIG c++2 abyss-server --cflags`
-          if test "x$XMLRPC_LIBS" = "x"; then
-              XMLRPC_LIBS=`$XMLRPC_C_CONFIG c++2 abyss-server --ldadd | \
-              sed -e 's/^-lpthread$//'  \
-                  -e 's/^-lpthread / /' \
-                  -e 's/ -lpthread$//'  \
-                  -e 's/ -lpthread / /' `
-              test "$ac_cv_static" = "yes" && XMLRPC_LIBS="-Wl,-Bstatic $XMLRPC_LIBS -Wl,-Bdynamic"
-          fi
-      fi
-  fi
-])
-
 AC_DEFUN([AC_FLDIGI_XMLRPC], [
-  AC_ARG_VAR([XMLRPC_C_CONFIG], [Path to xmlrpc-c-config utility])
-  AC_ARG_VAR([XMLRPC_CFLAGS], [C compiler flags for libxmlrpc-c, overrriding xmlrpc-c-config])
-  AC_ARG_VAR([XMLRPC_LIBS], [linker flags for libxmlrpc-c, overrriding xmlrpc-c-config])
-
   AC_ARG_WITH([xmlrpc],
               AC_HELP_STRING([--with-xmlrpc], [enable xmlrpc server support @<:@autodetect@:>@]),
               [case "${withval}" in
@@ -40,24 +11,12 @@ AC_DEFUN([AC_FLDIGI_XMLRPC], [
       AC_DEFINE(USE_XMLRPC, 0, [Define to 1 if we are using xmlrpc])
       ac_cv_xmlrpc=no
   else
-      AC_FLDIGI_XMLRPC_CONFIG
-      if test "x$ac_cv_want_xmlrpc" = "xcheck"; then
-          if test "x$ac_cv_xmlrpc" = "xyes"; then
-              AC_DEFINE(USE_XMLRPC, 1, [Define to 1 if we are using xmlrpc])
-          else
-              AC_DEFINE(USE_XMLRPC, 0, [Define to 1 if we are using xmlrpc])
-          fi
-      else # $ac_cv_want_xmlrpc is yes
-          if test "x$ac_cv_xmlrpc" = "xno"; then
-              AC_MSG_FAILURE([--with-xmlrpc was given, but check for libxmlrpc-c failed])
-          else
-              AC_DEFINE(USE_XMLRPC, 1, [Define to 1 if we are using xmlrpc])
-          fi
-      fi
+      ac_cv_xmlrpc=yes
+      AC_DEFINE(USE_XMLRPC, 1, [Define to 1 if we are using xmlrpc])
   fi
 
   if test "x$ac_cv_xmlrpc" = "xyes"; then
-      AC_DEFINE_UNQUOTED([XMLRPC_BUILD_VERSION], ["`$XMLRPC_C_CONFIG --version`"], [XMLRPC-C version])
+      AC_DEFINE_UNQUOTED([XMLRPC_BUILD_VERSION], ["Builtin"], [XMLRPC-C version])
   else
       AC_DEFINE_UNQUOTED([XMLRPC_BUILD_VERSION], [""], [XMLRPC-C version])
   fi