merge git work

svn path=/trunk/; revision=518

4 files changed, 0 insertions, 117 deletions

diff --git a/m4/.gitignore b/m4/.gitignore
deleted file mode 100644
index e429342b9..000000000
--- a/m4/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-gtk-doc.m4
-intltool.m4
diff --git a/m4/acinclude.m4 b/m4/acinclude.m4
deleted file mode 100644
index 3120d8620..000000000
--- a/m4/acinclude.m4
+++ /dev/null
@@ -1,65 +0,0 @@
-dnl Turn on the additional warnings last, so -Werror doesn't affect other tests.
-
-AC_DEFUN([IDT_COMPILE_WARNINGS],[
-   if test -f $srcdir/autogen.sh; then
-	default_compile_warnings="error"
-    else
-	default_compile_warnings="no"
-    fi
-
-    AC_ARG_WITH(compile-warnings,
-                AS_HELP_STRING([--with-compile-warnings=@<:@no/yes/error@:>@],
-                               [Compiler warnings]),
-                [enable_compile_warnings="$withval"],
-                [enable_compile_warnings="$default_compile_warnings"])
-
-    warnCFLAGS=
-    if test "x$GCC" != xyes; then
-	enable_compile_warnings=no
-    fi
-
-    warning_flags=
-    realsave_CFLAGS="$CFLAGS"
-
-    case "$enable_compile_warnings" in
-    no)
-	warning_flags=
-	;;
-    yes)
-	warning_flags="-Wall -Wunused -Wmissing-prototypes -Wmissing-declarations"
-	;;
-    maximum|error)
-	warning_flags="-Wall -Wunused -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
-	CFLAGS="$warning_flags $CFLAGS"
-	for option in -Wno-sign-compare -Wno-pointer-sign; do
-		SAVE_CFLAGS="$CFLAGS"
-		CFLAGS="$CFLAGS $option"
-		AC_MSG_CHECKING([whether gcc understands $option])
-		AC_TRY_COMPILE([], [],
-			has_option=yes,
-			has_option=no,)
-		CFLAGS="$SAVE_CFLAGS"
-		AC_MSG_RESULT($has_option)
-		if test $has_option = yes; then
-		  warning_flags="$warning_flags $option"
-		fi
-		unset has_option
-		unset SAVE_CFLAGS
-	done
-	unset option
-	if test "$enable_compile_warnings" = "error" ; then
-	    warning_flags="$warning_flags -Werror"
-	fi
-	;;
-    *)
-	AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
-	;;
-    esac
-    CFLAGS="$realsave_CFLAGS"
-    AC_MSG_CHECKING(what warning flags to pass to the C compiler)
-    AC_MSG_RESULT($warning_flags)
-
-    WARN_CFLAGS="$warning_flags"
-    AC_SUBST(WARN_CFLAGS)
-])
-
diff --git a/m4/empathy-args.m4 b/m4/empathy-args.m4
deleted file mode 100644
index 3daacbaba..000000000
--- a/m4/empathy-args.m4
+++ /dev/null
@@ -1,19 +0,0 @@
-dnl configure-time options for Empathy
-
-dnl EMPATHY_ARG_VALGRIND
-
-AC_DEFUN([EMPATHY_ARG_VALGRIND],
-[
-  dnl valgrind inclusion
-  AC_ARG_ENABLE(valgrind,
-    AC_HELP_STRING([--enable-valgrind],[enable valgrind checking and run-time detection]),
-    [
-      case "${enableval}" in
-        yes|no) enable="${enableval}" ;;
-        *)   AC_MSG_ERROR(bad value ${enableval} for --enable-valgrind) ;;
-      esac
-    ],
-    [enable=no])
-
-  EMPATHY_VALGRIND($enable, [2.1])
-])
diff --git a/m4/empathy-valgrind.m4 b/m4/empathy-valgrind.m4
deleted file mode 100644
index 7a44e103f..000000000
--- a/m4/empathy-valgrind.m4
+++ /dev/null
@@ -1,31 +0,0 @@
-dnl Detect Valgrind location and flags
-
-AC_DEFUN([EMPATHY_VALGRIND],
-[
-  enable=$1
-  if test -n "$2"; then
-    valgrind_req=$2
-  else
-    valgrind_req="2.1"
-  fi
-
-  PKG_CHECK_MODULES(VALGRIND, valgrind > "$valgrind_req",
-    have_valgrind_runtime="yes", have_valgrind_runtime="no")
-
-  AC_PATH_PROG(VALGRIND_PATH, valgrind)
-
-  # Compile the instrumentation for valgrind only if the valgrind
-  # libraries are installed and the valgrind executable is found
-  if test "x$enable" = xyes &&
-     test "$have_valgrind_runtime" = yes &&
-     test -n "$VALGRIND_PATH" ;
-  then
-    AC_DEFINE(HAVE_VALGRIND, 1, [Define if valgrind should be used])
-    AC_MSG_NOTICE(using compile-time instrumentation for valgrind)
-  fi
-
-  AC_SUBST(VALGRIND_CFLAGS)
-  AC_SUBST(VALGRIND_LIBS)
-
-  AM_CONDITIONAL(HAVE_VALGRIND, test -n "$VALGRIND_PATH")
-])