[nemiver] 640919 Fix build for autoconf < 2.64
- From: Dodji Seketeli <dodji src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nemiver] 640919 Fix build for autoconf < 2.64
- Date: Sat, 29 Jan 2011 23:23:30 +0000 (UTC)
commit 18b2bb3a63e917c3aa76673ff00697c0ec143967
Author: Dodji Seketeli <dodji seketeli org>
Date: Sun Jan 30 00:13:33 2011 +0100
640919 Fix build for autoconf < 2.64
* configure.ac: Require autoconf 2.63 instead of 2.64 because EL6
has 2.63. More AC_PREREQ after AC_INIT, for consistency. That
macro is the only one that can be invoked before AC_INIT, but
let's move it after AC_INIT like all other macros.
* src/workbench/nmv-workbench.cc: PACKAGE_URL is only defined by
AC_INIT on autoconf >= 2.64. Let's define it ourselves for
earlier versions.
configure.ac | 3 ++-
src/workbench/nmv-workbench.cc | 5 +++++
2 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b1f9b78..397b645 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,13 +6,14 @@ MAJOR_VERSION=0
MINOR_VERSION=8
MICRO_VERSION=2
-AC_PREREQ([2.64])
AC_INIT([nemiver],
[0.8.2],
[http://bugzilla.gnome.org/enter_bug.cgi?product=nemiver],
[nemiver],
[http://projects.gnome.org/nemiver])
+AC_PREREQ([2.63])
+
AC_CONFIG_HEADER([config.h])
AC_CONFIG_SRCDIR([README])
AC_CONFIG_MACRO_DIR([m4])
diff --git a/src/workbench/nmv-workbench.cc b/src/workbench/nmv-workbench.cc
index ca93bb7..733d6a6 100644
--- a/src/workbench/nmv-workbench.cc
+++ b/src/workbench/nmv-workbench.cc
@@ -46,6 +46,11 @@ using namespace std;
using namespace nemiver;
using namespace nemiver::common;
+#ifndef PACKAGE_URL
+// This is not define with autoconf < 2.64
+#define PACKAGE_URL "http://projects.gnome.org/nemiver"
+#endif
+
NEMIVER_BEGIN_NAMESPACE (nemiver)
static const UString CONF_KEY_NEMIVER_WINDOW_WIDTH =
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]