From acc7f891bdccbd58d92b957a20a0cb10f6a7513e Mon Sep 17 00:00:00 2001
From: Eitan Isaacson <eitan@ascender.com>
Date: Thu, 26 Mar 2009 13:51:06 +0200
Subject: Add gnome_program_init with LIBGNOMEUI_MODULE.

---
 configure.ac | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index cb11502..42d87c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,7 +39,8 @@ PANEL_REQUIRED_VERSION=2.0.0
 DBUS_REQUIRED_VERSION=0.76
 
 PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION
-                          libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION)
+                          libpanelapplet-2.0 >= $PANEL_REQUIRED_VERSION
+						  libgnomeui-2.0)
 AC_SUBST(APPLET_CFLAGS)
 AC_SUBST(APPLET_LIBS)
 
@@ -91,6 +92,22 @@ AM_CONDITIONAL(USE_GIR, test "x$gir_ok" = "xyes")
 
 GTK_DOC_CHECK([1.4])
 
+##############################
+# Custom Junk
+##############################
+
+AC_DEFUN([AC_DEFINE_PATH], [
+  test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+  ac_define_path=`eval echo [$]$2`
+  ac_define_path=`eval echo [$]ac_define_path`
+  $1="$ac_define_path"
+  AC_SUBST($1)
+  ifelse($3, ,
+    AC_DEFINE_UNQUOTED($1, "$ac_define_path"),
+    AC_DEFINE_UNQUOTED($1, "$ac_define_path", $3))
+])
+
 ###########################
 # Internationalization
 ###########################
@@ -98,9 +115,39 @@ GTK_DOC_CHECK([1.4])
 GETTEXT_PACKAGE=indicator-applet
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of the default gettext domain])
+AC_DEFINE_PATH(GNOMELOCALEDIR, "${datadir}/locale", [locale directory])
 
 AM_GLIB_GNU_GETTEXT
 
+##############################
+# ./configure Flags messings
+##############################
+
+cflags_set=${CFLAGS+set}
+# find the actual value for $prefix that we'll end up with
+REAL_PREFIX=
+if test "x$prefix" = "xNONE"; then
+  REAL_PREFIX=$ac_default_prefix
+else
+  REAL_PREFIX=$prefix
+fi
+
+# Have to go $sysconfdir->$prefix/etc->/usr/local/etc   
+# if you actually know how to code shell then fix this :-)
+SYSCONFDIR_TMP="$sysconfdir"
+old_prefix=$prefix
+prefix=$REAL_PREFIX
+EXPANDED_SYSCONFDIR=`eval echo $SYSCONFDIR_TMP`
+prefix=$old_prefix
+AC_SUBST(EXPANDED_SYSCONFDIR)
+
+dnl Save flags to aclocal
+ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
+
+AC_DEFINE_PATH(PREFIX, "${prefix}", [prefix directory])
+AC_DEFINE_PATH(SYSCONFDIR, "${sysconfdir}", [system configuration dir])
+AC_DEFINE_PATH(LIBDIR, "${libdir}", [system configuration dir])
+
 ###########################
 # Files
 ###########################
-- 
cgit v1.2.3


From 0d98376427b1d0382a59664bffb48f0c3377b285 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Thu, 26 Mar 2009 10:13:11 -0500
Subject: Bumping version

---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 42d87c6..f1887fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_INIT(src/applet-main.c)
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-applet, 0.1.3)
+AM_INIT_AUTOMAKE(indicator-applet, 0.1.4)
 
 AM_MAINTAINER_MODE
 
-- 
cgit v1.2.3


From 37af771e05d655d9fe3723a4138714c360d5fa14 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Thu, 26 Mar 2009 11:27:16 -0500
Subject: Getting gtkdoc stuff to be a little happier

---
 autogen.sh   | 2 +-
 configure.ac | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'configure.ac')

diff --git a/autogen.sh b/autogen.sh
index e9e599a..8e23f95 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -9,4 +9,4 @@ which gnome-autogen.sh || {
 
 USE_GNOME2_MACROS=1 \
 USE_COMMON_DOC_BUILD=yes \
-. gnome-autogen.sh
+gnome-autogen.sh --enable-gtk-doc
diff --git a/configure.ac b/configure.ac
index f1887fa..90d75c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -91,6 +91,8 @@ AM_CONDITIONAL(USE_GIR, test "x$gir_ok" = "xyes")
 ###########################
 
 GTK_DOC_CHECK([1.4])
+GNOME_DOC_INIT
+GNOME_COMPILE_WARNINGS
 
 ##############################
 # Custom Junk
-- 
cgit v1.2.3