From 72f3e68df0815d5f499234ae25b90eb2278960f8 Mon Sep 17 00:00:00 2001
From: upstream svn <svn@amule.org>
Date: Fri, 23 Dec 2011 15:12:19 +0000
Subject: [PATCH] Remove duplicate test from configure

---
 .svn-revision |   2 +-
 configure     | 447 ----------------------------------------------------------
 configure.in  |   3 -
 3 files changed, 1 insertion(+), 451 deletions(-)

diff --git a/.svn-revision b/.svn-revision
index 6f478507..1f09d9c8 100644
--- a/.svn-revision
+++ b/.svn-revision
@@ -1 +1 @@
-10700
+10701
diff --git a/configure b/configure
index 636eba1d..71f6b079 100755
--- a/configure
+++ b/configure
@@ -14952,453 +14952,6 @@ done
 
 fi
 
-if test ${PLASMAMULE:-no} = yes; then :
-
-
-	if test -z ${QT_MOC}; then :
-
-		for ac_prog in moc-qt4 moc
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_QT_MOC+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $QT_MOC in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_QT_MOC="$QT_MOC" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_QT_MOC="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-QT_MOC=$ac_cv_path_QT_MOC
-if test -n "$QT_MOC"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $QT_MOC" >&5
-$as_echo "$QT_MOC" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$QT_MOC" && break
-done
-
-		if test -z ${QT_MOC}; then :
-
-			echo moc not found
-			exit 1
-
-fi
-
-else
-
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for moc" >&5
-$as_echo_n "checking for moc... " >&6; }
-		if test -x ${QT_MOC}; then :
-
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${QT_MOC}" >&5
-$as_echo "${QT_MOC}" >&6; }
-
-
-else
-
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: \"not found\"" >&5
-$as_echo "\"not found\"" >&6; }
-			QT_MOC="not found"
-			exit 1
-
-fi
-
-fi
-
-
-	if test "${QT_MOC}" != "not found"; then :
-
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for moc version >= 4" >&5
-$as_echo_n "checking for moc version >= 4... " >&6; }
-		QT_MOC_VERSION=`${QT_MOC} -v 2>&1 | sed -e 's/^.* (/(/'`
-		if test `echo ${QT_MOC_VERSION} | sed -e 's/^.* //' -e 's/\..*$//'` = 4; then :
-
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found ${QT_MOC_VERSION}" >&5
-$as_echo "found ${QT_MOC_VERSION}" >&6; }
-
-else
-
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found ${QT_MOC_VERSION} is too old" >&5
-$as_echo "not found ${QT_MOC_VERSION} is too old" >&6; }
-			QT_MOC="not found"
-			exit 1
-
-fi
-
-fi
-
-	if test "${QT_MOC}" = "not found"; then :
-  enable_plasmamule=disabled
-fi
-
-	if test ${enable_plasmamule:-no} = yes; then :
-
-
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for qt" >&5
-$as_echo_n "checking for qt... " >&6; }
-	if test `${PKG_CONFIG} QtCore` --exists && `${PKG_CONFIG} QtGui --exists`; then :
-
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
-$as_echo "found" >&6; }
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for qt core cflags" >&5
-$as_echo_n "checking for qt core cflags... " >&6; }
-		QT_CORE_CXXFLAGS=`${PKG_CONFIG} --cflags QtCore`
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $QT_CORE_CFLAGS" >&5
-$as_echo "$QT_CORE_CFLAGS" >&6; }
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for qt core libs" >&5
-$as_echo_n "checking for qt core libs... " >&6; }
-		QT_CORE_LIBS=`${PKG_CONFIG} --libs QtCore`
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $QT_CORE_LIBS" >&5
-$as_echo "$QT_CORE_LIBS" >&6; }
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for qt gui cflags" >&5
-$as_echo_n "checking for qt gui cflags... " >&6; }
-		QT_GUI_CXXFLAGS=`${PKG_CONFIG} --cflags QtGui`
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $QT_GUI_CFLAGS" >&5
-$as_echo "$QT_GUI_CFLAGS" >&6; }
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for qt gui libs" >&5
-$as_echo_n "checking for qt gui libs... " >&6; }
-		QT_GUI_LIBS=`${PKG_CONFIG} --libs QtGui`
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $QT_GUI_LIBS" >&5
-$as_echo "$QT_GUI_LIBS" >&6; }
-
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
-		exit 1
-
-fi
-
-	if test `${PKG_CONFIG} QtDBus --modversion | sed -e 's/\.//g'` -ge 470 ; then :
-
-		QT_DBUS_LDFLAGS="-lQtDBus"
-
-
-fi
-
-
-
-
-
-
-		if test -z "${QT_CORE_CXXFLAGS}"; then :
-  enable_plasmamule=disabled
-fi
-
-fi
-
-	if test ${enable_plasmamule:-no} = yes; then :
-
-
-	if test -z ${KDE4_CONFIG}; then :
-
-		# Extract the first word of "kde4-config", so it can be a program name with args.
-set dummy kde4-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_KDE4_CONFIG+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $KDE4_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_KDE4_CONFIG="$KDE4_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_KDE4_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-KDE4_CONFIG=$ac_cv_path_KDE4_CONFIG
-if test -n "$KDE4_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $KDE4_CONFIG" >&5
-$as_echo "$KDE4_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-else
-
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kde4-config" >&5
-$as_echo_n "checking for kde4-config... " >&6; }
-		if test ! -x KDE4_CONFIG; then :
-
-			KDE4_CONFIG="not found"
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
-			exit 1
-
-fi
-
-fi
-
-	if  test "${KDE4_CONFIG}" != "not found"; then :
-
-		KDE_CONF_VER=`${KDE4_CONFIG} --version | grep KDE | sed -e 's/^.*: //' -e 's/ (.*$//'`
-		if test `echo ${KDE_CONF_VER} | sed -e 's/\..*$//'` = 4; then :
-
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: found ${KDE4_CONFIG} with version ${KDE_CONF_VER}" >&5
-$as_echo "found ${KDE4_CONFIG} with version ${KDE_CONF_VER}" >&6; }
-
-else
-
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: at least version 4 required" >&5
-$as_echo "at least version 4 required" >&6; }
-			exit 1
-
-fi
-
-else
-
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
-		exit 1
-
-fi
-
-
-		if test "${KDE4_CONFIG}" = "not found"; then :
-  enable_plasmamule=disabled
-fi
-
-fi
-
-	if test ${enable_plasmamule:-no} = yes; then :
-
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kde4 headers" >&5
-$as_echo_n "checking for kde4 headers... " >&6; }
-	KDE_HEADER_DIR=`${KDE4_CONFIG} --path include`
-
-	if test -f ${KDE_HEADER_DIR}kdirwatch.h; then :
-
-		if test -f ${KDE_HEADER_DIR}plasma/dataengine.h; then :
-
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${KDE_HEADER_DIR}" >&5
-$as_echo "${KDE_HEADER_DIR}" >&6; }
-
-else
-
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: dataengine.h not found" >&5
-$as_echo "dataengine.h not found" >&6; }
-			exit 1
-
-fi
-
-else
-
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: kdirwatch.h not found" >&5
-$as_echo "kdirwatch.h not found" >&6; }
-		exit 1
-
-fi
-
-
-		if test -z ${KDE_HEADER_DIR}; then :
-  enable_plasmamule=disabled
-fi
-
-fi
-
-	if test ${enable_plasmamule:-no} = yes; then :
-
-		if test -e `$BUILD_CC -print-file-name=libplasma.so` &&
-			test -e `$BUILD_CC -print-file-name=libkdecore.so`; then :
-
-
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kde4 applinks Path" >&5
-$as_echo_n "checking for kde4 applinks Path... " >&6; }
-	if test `echo ${prefix} | grep home | wc -l` == 1; then :
-
-		KDE_IN_HOME="yes"
-
-fi
-	if test ${KDE_IN_HOME} = "yes"; then :
-
-		KDE_APPLNK_PATH=`${KDE4_CONFIG} --path xdgdata-apps | tr ":" "\n" | $EGREP '(/home|/root)' | head -1`
-
-else
-
-		if test -n ${prefix}; then :
-
-			KDE_APPLNK_PATH=`${KDE4_CONFIG} --path xdgdata-apps | tr ":" "\n" | grep ${prefix} | head -1`
-			if test -n ${KDE_APPLNK_PATH}; then :
-
-				KDE_APPLNK_PATH=`${KDE4_CONFIG} --path xdgdata-apps | tr ":" "\n" | grep -vE '(/home|/root)' | head -1`
-
-fi
-
-else
-
-			KDE_APPLNK_PATH=`${KDE4_CONFIG} --path xdgdata-apps | tr ":" "\n" | grep -vE '(/home|/root)' | head -1`
-
-fi
-
-fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${KDE_APPLNK_PATH}" >&5
-$as_echo "${KDE_APPLNK_PATH}" >&6; }
-
-
-
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kde4 services Path" >&5
-$as_echo_n "checking for kde4 services Path... " >&6; }
-	if test `echo ${prefix} | grep home | wc -l` == 1; then :
-
-		KDE_IN_HOME="yes"
-
-fi
-	if test ${KDE_IN_HOME} = "yes"; then :
-
-		KDE_SERVICE_PATH=`${KDE4_CONFIG} --path services | tr ":" "\n" | $EGREP '(/home|/root)' | head -1`
-
-else
-
-		KDE_SERVICE_PATH=`${KDE4_CONFIG} --path services | tr ":" "\n" | grep /usr | head -1`
-
-fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${KDE_SERVICE_PATH}" >&5
-$as_echo "${KDE_SERVICE_PATH}" >&6; }
-
-
-
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kde4 plugins Path" >&5
-$as_echo_n "checking for kde4 plugins Path... " >&6; }
-	if test `echo ${prefix} | grep home | wc -l` == 1; then :
-
-		KDE_IN_HOME="yes"
-
-fi
-	if test ${KDE_IN_HOME} = "yes"; then :
-
-		KDE_MODULE_PATH=`${KDE4_CONFIG} --path module | tr ":" "\n" | $EGREP '(/home|/root)' | head -1`
-
-else
-
-		KDE_MODULE_PATH=`${KDE4_CONFIG} --path module | tr ":" "\n" | grep /usr | head -1`
-
-fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${KDE_MODULE_PATH}" >&5
-$as_echo "${KDE_MODULE_PATH}" >&6; }
-
-
-
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for kde4 icons Path" >&5
-$as_echo_n "checking for kde4 icons Path... " >&6; }
-	if test `echo ${prefix} | grep home | wc -l` == 1; then :
-
-		KDE_IN_HOME="yes"
-
-fi
-	if test ${KDE_IN_HOME} = "yes"; then :
-
-		KDE_ICON_PATH=`${KDE4_CONFIG} --path icon | tr ":" "\n" | $EGREP '(/home|/root)' | head -1`
-
-else
-
-		KDE_ICON_PATH=`${KDE4_CONFIG} --path icon | tr ":" "\n" | grep /usr | head -1`
-
-fi
-	KDE_ICON_PATH=${KDE_ICON_PATH}hicolor/scalable/mimetypes/
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${KDE_ICON_PATH}" >&5
-$as_echo "${KDE_ICON_PATH}" >&6; }
-
-
-
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for location for mime-type installation" >&5
-$as_echo_n "checking for location for mime-type installation... " >&6; }
-	if test `echo ${prefix} | grep home | wc -l` == 1; then :
-
-		KDE_IN_HOME="yes"
-
-fi
-	if test ${KDE_IN_HOME} = "yes"; then :
-
-		KDE_MIME_PATH=`${KDE4_CONFIG} --path xdgdata-mime | tr ":" "\n" | $EGREP '(/home|/root)' | head -1`
-
-else
-
-		if test -n ${prefix}; then :
-
-			KDE_MIME_PATH=`${KDE4_CONFIG} --path xdgdata-mime | tr ":" "\n" | grep ${prefix} | head -1`
-			if test -n ${KDE_MIME_PATH}; then :
-
-				KDE_MIME_PATH=`${KDE4_CONFIG} --path xdgdata-mime | tr ":" "\n" | $EGREP -v '(/home|/root)' | head -1`
-
-fi
-
-else
-
-			KDE_MIME_PATH=`${KDE4_CONFIG} --path xdgdata-mime | tr ":" "\n" | $EGREP -v '(/home|/root)' | head -1`
-
-fi
-
-fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${KDE_MIME_PATH}" >&5
-$as_echo "${KDE_MIME_PATH}" >&6; }
-
-
-
-else
-  enable_plasmamule=disabled
-fi
-
-fi
-
-	if test ${enable_debug:-yes} = yes; then :
-
-		DEBUGFLAG="-D__DEBUG__"
-
-
-fi
-
-fi
-
 # DO NOT MOVE UP... THERE'S A REASON TO BE HERE!!
 
 
diff --git a/configure.in b/configure.in
index a67380e1..8bb59e26 100644
--- a/configure.in
+++ b/configure.in
@@ -375,9 +375,6 @@ AM_CONDITIONAL([COMPILE_LIB_EC],	[test MULE_IS_ENABLED_ANY([monolithic, amule-da
 # Check for readline library
 MULE_IF_ENABLED_ANY([amulecmd, webserver], [VL_LIB_READLINE])
 
-AS_IF([test ${PLASMAMULE:-no} = yes],
-[PLASMAMULE_CHECKS])
-
 # DO NOT MOVE UP... THERE'S A REASON TO BE HERE!!
 
 MULE_CHECK_CCACHE
-- 
2.11.4.GIT