From 7c0bf2dc0d05adb413707c28e1c42bcd93dfe18c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Wed, 15 Jun 2011 16:44:55 +0100 Subject: Update autotools configuration Do not use deprecated macros Use new libtool syntax Remove unneeded code --- Makefile.am | 2 ++ configure.ac | 45 +++++++++++++++++++-------------------------- 2 files changed, 21 insertions(+), 26 deletions(-) diff --git a/Makefile.am b/Makefile.am index 0de0f59..5920abe 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,5 @@ +ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} + SUBDIRS = \ src \ bindings \ diff --git a/configure.ac b/configure.ac index 360df06..996ba8a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,24 +1,28 @@ - -AC_INIT(libappindicator, 0.3.0, ted@canonical.com) +AC_INIT([libappindicator], + [0.3.0], + [http://bugs.launchpad.net/libappindicator], + [libappindicator], + [http://launchpad.net/libappindicator]) AC_COPYRIGHT([Copyright 2009, 2010 Canonical]) -AC_PREREQ(2.53) +AC_PREREQ([2.64]) + +AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_MACRO_DIR([m4]) + +AM_INIT_AUTOMAKE([1.11]) -AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(libappindicator, 0.3.0) +AM_MAINTAINER_MODE([enable]) -AM_MAINTAINER_MODE +AM_SILENT_RULES([yes]) -AC_ISC_POSIX +# Check for programs AC_PROG_CC AM_PROG_CC_C_O -AC_STDC_HEADERS -AC_PROG_LIBTOOL - -AC_SUBST(VERSION) -AC_CONFIG_MACRO_DIR([m4]) -m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) +# Initialize libtool +LT_PREREQ([2.2]) +LT_INIT AC_PATH_PROG([GLIB_MKENUMS], [glib-mkenums]) AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal]) @@ -30,7 +34,6 @@ PKG_PROG_PKG_CONFIG ########################### GTK_DOC_CHECK([1.9]) -AC_CONFIG_MACRO_DIR(m4) ########################### @@ -56,8 +59,6 @@ AS_IF([test "x$with_gtk" = x3], gio-2.0 >= $GIO_REQUIRED_VERSION indicator3 >= $INDICATOR_REQUIRED_VERSION dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION) - AC_SUBST(LIBRARY_CFLAGS) - AC_SUBST(LIBRARY_LIBS) AC_DEFINE(HAVE_GTK3, 1, [whether gtk3 is available]) ], [test "x$with_gtk" = x2], @@ -66,16 +67,12 @@ AS_IF([test "x$with_gtk" = x3], gio-2.0 >= $GIO_REQUIRED_VERSION indicator >= $INDICATOR_REQUIRED_VERSION dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION) - AC_SUBST(LIBRARY_CFLAGS) - AC_SUBST(LIBRARY_LIBS) ], [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])] ) AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3]) PKG_CHECK_MODULES(TESTDEPS, dbus-glib-1) -AC_SUBST(TESTDEPS_CFLAGS) -AC_SUBST(TESTDEPS_LIBS) ########################### # GObject Introspection @@ -147,8 +144,6 @@ AC_SUBST(GENERATED_SOURCES) GLIB_SHARP_REQ_VERSION=2.12.1 GTK_SHARP_REQ_VERSION=2.12 PKG_CHECK_MODULES(GTK_SHARP, gtk-sharp-2.0 >= $GTK_SHARP_REQ_VERSION) -AC_SUBST(GTK_SHARP_LIBS) -AC_SUBST(GTK_SHARP_CFLAGS) PKG_CHECK_MODULES(GAPI, gapi-2.0 >= $GLIB_SHARP_REQ_VERSION) AC_PATH_PROG(GAPI_PARSER, gapi2-parser, no) @@ -159,7 +154,6 @@ AC_PATH_PROG(GAPI_FIXUP, gapi2-fixup, no) AC_SUBST(GAPI_FIXUP) PKG_CHECK_MODULES(NUNIT, nunit >= 2.4.7) -AC_SUBST(NUNIT_LIBS) ########################### # Check to see if we're local @@ -184,8 +178,6 @@ PKG_CHECK_MODULES(APPINDICATOR_PYTHON, gtk+-2.0 >= $GTK_REQUIRED_VERSION pygobject-2.0 >= $PYGOBJECT_REQUIRED ]) -AC_SUBST(APPINDICATOR_PYTHON_CFLAGS) -AC_SUBST(APPINDICATOR_PYTHON_LIBS) AC_MSG_CHECKING(for pygtk defs) PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0` @@ -201,7 +193,7 @@ AC_MSG_RESULT($PYGTK_CODEGEN) # Files ########################### -AC_OUTPUT([ +AC_CONFIG_FILES([ Makefile src/Makefile src/appindicator-0.1.pc @@ -222,6 +214,7 @@ docs/reference/Makefile docs/reference/version.xml docs/reference/libappindicator-docs.sgml ]) +AC_OUTPUT ########################### # Results -- cgit v1.2.3 From b3466bdd576cd1311f8b26c3d5eae400618ac63e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Wed, 15 Jun 2011 16:46:16 +0100 Subject: configure.ac: Generate xz tarballs with pax format by default --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 996ba8a..cb68727 100644 --- a/configure.ac +++ b/configure.ac @@ -10,7 +10,7 @@ AC_PREREQ([2.64]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE([1.11]) +AM_INIT_AUTOMAKE([1.11 -Wall tar-ustar no-dist-gzip dist-xz]) AM_MAINTAINER_MODE([enable]) -- cgit v1.2.3 From 654b97f024caf49b4f90e8011c8f59202c562c78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Thu, 16 Jun 2011 15:06:40 +0100 Subject: Trivial documentation fix The property name is 'icon-desc', not 'icon-description' --- src/app-indicator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app-indicator.c b/src/app-indicator.c index cc785ca..a828113 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -1765,7 +1765,7 @@ app_indicator_set_icon (AppIndicator *self, const gchar *icon_name) application icon for the program. Wrapper function for property #AppIndicator:icon-name and - #AppIndicator::icon-description. + #AppIndicator::icon-desc. **/ void app_indicator_set_icon_full (AppIndicator *self, const gchar *icon_name, const gchar * icon_desc) -- cgit v1.2.3 From ea77e8e1f93a64397d73f4c369fd90f76db49f35 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 16 Jun 2011 21:35:50 -0500 Subject: Free name if we get it --- src/app-indicator.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app-indicator.c b/src/app-indicator.c index a828113..bc08eea 100644 --- a/src/app-indicator.c +++ b/src/app-indicator.c @@ -1235,6 +1235,7 @@ bus_watcher_ready (GObject * obj, GAsyncResult * res, gpointer user_data) g_object_unref(G_OBJECT(user_data)); return; } + g_free(name); /* g_object_unref(G_OBJECT(user_data)); */ /* Why is this commented out? Oh, wait, we don't want to -- cgit v1.2.3 From f20865cc143cb537b7612ec19fc889b41777982a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 7 Jul 2011 13:50:17 -0500 Subject: Migrate to libindicator 0.4 --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 57eb7a1..d045714 100644 --- a/configure.ac +++ b/configure.ac @@ -57,7 +57,7 @@ AS_IF([test "x$with_gtk" = x3], [PKG_CHECK_MODULES(LIBRARY, gtk+-3.0 >= $GTK3_REQUIRED_VERSION glib-2.0 >= $GLIB_REQUIRED_VERSION gio-2.0 >= $GIO_REQUIRED_VERSION - indicator3 >= $INDICATOR_REQUIRED_VERSION + indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION) AC_DEFINE(HAVE_GTK3, 1, [whether gtk3 is available]) ], @@ -65,7 +65,7 @@ AS_IF([test "x$with_gtk" = x3], [PKG_CHECK_MODULES(LIBRARY, gtk+-2.0 >= $GTK_REQUIRED_VERSION glib-2.0 >= $GLIB_REQUIRED_VERSION gio-2.0 >= $GIO_REQUIRED_VERSION - indicator >= $INDICATOR_REQUIRED_VERSION + indicator-0.4 >= $INDICATOR_REQUIRED_VERSION dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION) ], [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])] -- cgit v1.2.3 From 15fccc965903995f7041cd4f9bac6ced964d44cc Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 7 Jul 2011 14:45:12 -0500 Subject: Removing -Werror for the Vala compiler --- bindings/vala/examples/Makefile.am | 2 +- example/Makefile.am | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/bindings/vala/examples/Makefile.am b/bindings/vala/examples/Makefile.am index 484a00a..67ad932 100644 --- a/bindings/vala/examples/Makefile.am +++ b/bindings/vala/examples/Makefile.am @@ -23,7 +23,7 @@ indicator-example.c: $(VALAFILES) Makefile.am nodist_indicator_example_SOURCES = indicator-example.c indicator_example_CFLAGS = \ $(LIBRARY_CFLAGS) \ - -Wall -Werror \ + -Wall \ -I$(top_srcdir)/src \ -include $(top_srcdir)/src/app-indicator.h indicator_example_LDADD = \ diff --git a/example/Makefile.am b/example/Makefile.am index dbea724..ff313f6 100644 --- a/example/Makefile.am +++ b/example/Makefile.am @@ -18,10 +18,11 @@ check_PROGRAMS = \ simple_client_SOURCES = \ simple-client.c +#-Werror removed for Vala simple_client_CFLAGS = \ $(LIBRARY_CFLAGS) \ -DLOCAL_ICON="\"$(abs_srcdir)/simple-client-test-icon.png\"" \ - -Wall -Werror \ + -Wall \ -I$(top_srcdir)/src simple_client_LDADD = \ -- cgit v1.2.3 From bf95161bb260f193fbb8508f5f25c56080498a31 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 7 Jul 2011 14:45:18 -0500 Subject: 0.3.90 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index d045714..75c5200 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_INIT([libappindicator], - [0.3.0], + [0.3.90], [http://bugs.launchpad.net/libappindicator], [libappindicator], [http://launchpad.net/libappindicator]) -- cgit v1.2.3