From d0d73e91453b15611971d49615c843c5c2445d85 Mon Sep 17 00:00:00 2001
From: Marco Barisione <marco.barisione@collabora.co.uk>
Date: Fri, 17 May 2013 15:15:35 +0100
Subject: =?UTF-8?q?m4:=20rename=20valgrind=20macro=20names=20and=20files?=
 =?UTF-8?q?=20(empathy=20=E2=86=92=20tpaw)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://bugzilla.gnome.org/show_bug.cgi?id=699492
---
 m4/empathy-args.m4     | 19 -------------------
 m4/empathy-valgrind.m4 | 31 -------------------------------
 m4/tpaw-args.m4        | 19 +++++++++++++++++++
 m4/tpaw-valgrind.m4    | 31 +++++++++++++++++++++++++++++++
 4 files changed, 50 insertions(+), 50 deletions(-)
 delete mode 100644 m4/empathy-args.m4
 delete mode 100644 m4/empathy-valgrind.m4
 create mode 100644 m4/tpaw-args.m4
 create mode 100644 m4/tpaw-valgrind.m4

(limited to 'm4')

diff --git a/m4/empathy-args.m4 b/m4/empathy-args.m4
deleted file mode 100644
index 3daacbab..00000000
--- 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 7a44e103..00000000
--- 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")
-])
diff --git a/m4/tpaw-args.m4 b/m4/tpaw-args.m4
new file mode 100644
index 00000000..5dccce2c
--- /dev/null
+++ b/m4/tpaw-args.m4
@@ -0,0 +1,19 @@
+dnl configure-time options for telepathy-account-widgets
+
+dnl TPAW_ARG_VALGRIND
+
+AC_DEFUN([TPAW_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])
+
+  TPAW_VALGRIND($enable, [2.1])
+])
diff --git a/m4/tpaw-valgrind.m4 b/m4/tpaw-valgrind.m4
new file mode 100644
index 00000000..bda1fb52
--- /dev/null
+++ b/m4/tpaw-valgrind.m4
@@ -0,0 +1,31 @@
+dnl Detect Valgrind location and flags
+
+AC_DEFUN([TPAW_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")
+])
-- 
cgit v1.2.1