[giggle] Modernize autotools configuration
- From: Javier Jardón <jjardon src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [giggle] Modernize autotools configuration
- Date: Mon, 25 Jan 2010 20:49:57 +0000 (UTC)
commit d7283f2dfae1532a42b30f0d180369c0b2e08ec3
Author: Javier Jardón <jjardon gnome org>
Date: Mon Jan 25 19:28:46 2010 +0100
Modernize autotools configuration
New required dependencies:
autoconf >= 2.63.2
intltool >= 0.40.0
gettext >= 0.17
configure.ac | 14 +++++++++-----
src/Makefile.am | 1 -
src/giggle-window.c | 4 ++--
3 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 07bc12c..fb7f047 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,10 @@
dnl Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.61)
-AC_INIT([Giggle],[0.4.91],
+AC_PREREQ(2.63.2)
+AC_INIT([Giggle],
+ [0.4.91],
[http://bugzilla.gnome.org/enter_bug.cgi?product=giggle],
- [giggle])
+ [giggle],
+ [http://live.gnome.org/giggle])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_SRCDIR([configure.ac])
@@ -14,10 +16,12 @@ AM_INIT_AUTOMAKE([1.10 check-news -Wall -Werror])
# to make
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+# Check for programs
AC_PROG_CC
AM_PROG_CC_C_O
AC_PROG_CXX
+# Initialize libtool
LT_PREREQ([2.2.6])
LT_INIT([disable-static win32-dll])
@@ -112,9 +116,9 @@ AC_RUN_IFELSE(
dnl ------------------
dnl | Language Support |---------------------------------------
dnl ------------------
-IT_PROG_INTLTOOL([0.35.0])
+IT_PROG_INTLTOOL([0.40.0])
AC_SUBST([GETTEXT_PACKAGE], [giggle])
-AM_GNU_GETTEXT_VERSION([0.11])
+AM_GNU_GETTEXT_VERSION([0.17])
AM_GLIB_GNU_GETTEXT
AC_DEFINE([GETTEXT_PACKAGE], [PACKAGE_TARNAME],[Define to the gettext package name])
AM_GLIB_DEFINE_LOCALEDIR(LOCALEDIR)
diff --git a/src/Makefile.am b/src/Makefile.am
index 11f19cd..ee4aba8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir) \
-DICONDIR='"$(datadir)/icons"' \
-DGLADEDIR='"$(pkgdatadir)/glade"' \
- -DPACKAGE_WEBSITE='"http://live.gnome.org/giggle/"' \
$(GIGGLE_CFLAGS) $(PLATFORM_CFLAGS) \
$(WARN_CFLAGS)
diff --git a/src/giggle-window.c b/src/giggle-window.c
index 894e30e..14fe517 100644
--- a/src/giggle-window.c
+++ b/src/giggle-window.c
@@ -890,7 +890,7 @@ static void
window_action_homepage_cb (GtkAction *action,
GiggleWindow *window)
{
- window_visit_uri (window, PACKAGE_WEBSITE);
+ window_visit_uri (window, PACKAGE_URL);
}
static void
@@ -919,7 +919,7 @@ window_action_about_cb (GtkAction *action,
"Copyright \xc2\xa9 2008 Mathias Hasselmann",
"translator-credits", _("translator-credits"),
"comments", _("A graphical frontend to the git content tracker."),
- "website", PACKAGE_WEBSITE,
+ "website", PACKAGE_URL,
"logo-icon-name", PACKAGE,
"version", VERSION,
"authors", authors,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]