diff options
| author | Murray Cumming <murrayc@murrayc.com> | 2006-07-16 19:34:11 +0000 |
|---|---|---|
| committer | Murray Cumming <murrayc@src.gnome.org> | 2006-07-16 19:34:11 +0000 |
| commit | 6958d84e425f7bb7eed0852d78b3dc2c3503680e (patch) | |
| tree | 8b974515530e3047e1627674dc823f3f4f064cd2 | |
| parent | f0efaac0ccbdf916d600cc5c731b8993598c8dbd (diff) | |
| download | glibmm-6958d84e425f7bb7eed0852d78b3dc2c3503680e.tar.gz | |
Quote GLIBMM_*_VERSION to avoid m4 warnings. Patch from Bug #347076 from
2006-07-16 Murray Cumming <murrayc@murrayc.com>
* configure.in: Quote GLIBMM_*_VERSION to avoid m4 warnings. Patch from
Bug #347076 from Kevin McBride.
* scripts/sun.m4: Quote GLIBMM_PROG_CXX_SUN to avoid an m4 warning.
Patch from Bug #347077 from Kevin McBride.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | scripts/sun.m4 | 2 |
3 files changed, 10 insertions, 4 deletions
@@ -1,3 +1,9 @@ +2006-07-16 Murray Cumming <murrayc@murrayc.com> + + * configure.in: Quote GLIBMM_*_VERSION to avoid m4 warnings. Patch from + Bug #347076 from Kevin McBride. + * scripts/sun.m4: Quote GLIBMM_PROG_CXX_SUN to avoid an m4 warning. + Patch from Bug #347077 from Kevin McBride. 2006-06-09 Cedric Gustin <cedric.gustin@gmail.com> diff --git a/configure.in b/configure.in index 5babcdc2..89883120 100644 --- a/configure.in +++ b/configure.in @@ -22,9 +22,9 @@ GLIBMM_MINOR_VERSION=10 GLIBMM_MICRO_VERSION=4 GLIBMM_VERSION=$GLIBMM_MAJOR_VERSION.$GLIBMM_MINOR_VERSION.$GLIBMM_MICRO_VERSION GLIBMM_RELEASE=$GLIBMM_MAJOR_VERSION.$GLIBMM_MINOR_VERSION -AC_DEFINE_UNQUOTED(GLIBMM_MAJOR_VERSION, $GLIBMM_MAJOR_VERSION) -AC_DEFINE_UNQUOTED(GLIBMM_MINOR_VERSION, $GLIBMM_MINOR_VERSION) -AC_DEFINE_UNQUOTED(GLIBMM_MICRO_VERSION, $GLIBMM_MICRO_VERSION) +AC_DEFINE([GLIBMM_MAJOR_VERSION], [$GLIBMM_MAJOR_VERSION], [Major Version]) +AC_DEFINE([GLIBMM_MINOR_VERSION], [$GLIBMM_MINOR_VERSION], [Minor Version]) +AC_DEFINE([GLIBMM_MICRO_VERSION], [$GLIBMM_MICRO_VERSION], [Micro Version]) AC_SUBST(GLIBMM_MAJOR_VERSION) AC_SUBST(GLIBMM_MINOR_VERSION) AC_SUBST(GLIBMM_MICRO_VERSION) diff --git a/scripts/sun.m4 b/scripts/sun.m4 index 1526783a..6b8950f7 100644 --- a/scripts/sun.m4 +++ b/scripts/sun.m4 @@ -1,4 +1,4 @@ -AC_DEFUN(GLIBMM_PROG_CXX_SUN, +AC_DEFUN([GLIBMM_PROG_CXX_SUN], [AC_CACHE_CHECK(whether we are using SUN CC compiler, ac_cv_prog_sun_cxx, [if AC_TRY_COMMAND(${CXX-g++} -V 2>&1) | egrep "Sun WorkShop" >/dev/null 2>&1; then ac_cv_prog_sun_cxx=yes |