[byzanz] Get rid of outdated macro magic

[Benjamin Otte <otte src gnome org>]

commit 11a42d714405fd2d485e5f50fae9f36572289f13
Author: Benjamin Otte <otte gnome org>
Date:   Sun Aug 30 21:24:02 2009 +0200

    Get rid of outdated macro magic
    
    Use current magic instead

 configure.ac               |   12 ++----------
 macros/Makefile.am         |    4 +---
 macros/as-ac-expand.m4     |   43 -------------------------------------------
 macros/as-scrub-include.m4 |   36 ------------------------------------
 src/byzanzapplet.c         |    2 +-
 src/record.c               |    2 +-
 6 files changed, 5 insertions(+), 94 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index e95a3b2..6da9d49 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,15 +24,10 @@ dnl the gettext stuff needed
 ALL_LINGUAS="ar ca cs da de dz el en_GB es fi fr gl hu ja nb oc pl pt_BR ru sv tr vi"
 GETTEXT_PACKAGE=$PACKAGE
 AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_DIR(GNOMELOCALEDIR, "${datadir}/locale", [locale directory])
 AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], "$GETTEXT_PACKAGE",
                    [gettext package name])
 AM_GLIB_GNU_GETTEXT
-
-dnl define LOCALEDIR in config.h
-AS_AC_EXPAND(LOCALEDIR, $datadir/locale)
-AC_DEFINE_UNQUOTED([LOCALEDIR], "$LOCALEDIR",
-                   [gettext locale dir])
+AM_GLIB_DEFINE_LOCALEDIR(GNOMELOCALEDIR)
 
 
 AC_PROG_CC
@@ -75,7 +70,7 @@ APPLET_REQ="2.10.0"
 XDAMAGE_REQ="1.0"
 GST_REQ="0.10.24"
 
-PKG_CHECK_MODULES(GTK, cairo >= $CAIRO_REQ gtk+-2.0 >= $GTK_REQ x11, gio-2.0)
+PKG_CHECK_MODULES(GTK, cairo >= $CAIRO_REQ gtk+-2.0 >= $GTK_REQ x11 gio-2.0)
 
 PKG_CHECK_MODULES(GTHREAD, xdamage >= $XDAMAGE_REQ gthread-2.0 >= $GTHREAD_REQ)
 
@@ -90,19 +85,16 @@ AM_GCONF_SOURCE_2
 
 GIFENC_CFLAGS="$GTK_CFLAGS $ERROR_CFLAGS"
 GIFENC_LIBS="$GTK_LIBS"
-AS_SCRUB_INCLUDE(GIFENC_CFLAGS)
 AC_SUBST(GIFENC_CFLAGS)
 AC_SUBST(GIFENC_LIBS)
 
 BYZANZ_CFLAGS="$GTK_CFLAGS $GTHREAD_CFLAGS $GST_CFLAGS $ERROR_CFLAGS"
 BYZANZ_LIBS="$GTK_LIBS $GTHREAD_LIBS $GST_LIBS"
-AS_SCRUB_INCLUDE(BYZANZ_CFLAGS)
 AC_SUBST(BYZANZ_CFLAGS)
 AC_SUBST(BYZANZ_LIBS)
 
 APPLET_CFLAGS="$APPLET_CFLAGS $BYZANZ_CFLAGS"
 APPLET_LIBS="$APPLET_LIBS $BYZANZ_LIBS"
-AS_SCRUB_INCLUDE(APPLET_CFLAGS)
 
 dnl #########################
 dnl # Make the output files #
diff --git a/macros/Makefile.am b/macros/Makefile.am
index aaa5e6f..df6761d 100644
--- a/macros/Makefile.am
+++ b/macros/Makefile.am
@@ -1,6 +1,4 @@
 EXTRA_DIST= \
 	ac-define-dir.m4 \
 	as-compiler-flag.m4 \
-	as-version.m4 \
-	as-ac-expand.m4 \
-	as-scrub-include.m4
+	as-version.m4
diff --git a/src/byzanzapplet.c b/src/byzanzapplet.c
index c5e0df9..c5742e5 100644
--- a/src/byzanzapplet.c
+++ b/src/byzanzapplet.c
@@ -375,7 +375,7 @@ byzanz_applet_fill (PanelApplet *applet, const gchar *iid, gpointer data)
   if (!index_quark)
     index_quark = g_quark_from_static_string ("Byzanz-Index");
 #ifdef GETTEXT_PACKAGE
-  bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+  bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
   textdomain (GETTEXT_PACKAGE);
 #endif
diff --git a/src/record.c b/src/record.c
index 64c1610..949d240 100644
--- a/src/record.c
+++ b/src/record.c
@@ -121,7 +121,7 @@ main (int argc, char **argv)
   
   g_set_prgname (argv[0]);
 #ifdef GETTEXT_PACKAGE
-  bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);
+  bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
   textdomain (GETTEXT_PACKAGE);
 #endif