From 0bde7e57a2a4f5098724511b808a175e1c2d5135 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Tue, 18 Sep 2007 23:46:18 +0000 Subject: [PATCH] Avoid portability warnings from automake --- ChangeLog | 6 ++++++ configure.in | 28 ++++++++-------------------- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index b164e02ca6..0c8669a2b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Sep 18 19:42:00 EST 2007 Daniel P. Berrange + + * configure.in: Re-arrange to use new style AC_INIT/AM_INIT_AUTOMAKE + style calls. Pass -Wno-portability flag to automake to keep quiet about + GNUmake-isms + Tue Sep 18 19:36:00 EST 2007 Daniel P. Berrange * configure.in: Don't check for Linux bridge headers if QEMU diff --git a/configure.in b/configure.in index 1fe195304c..c3c93bd975 100644 --- a/configure.in +++ b/configure.in @@ -1,37 +1,25 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(src/libvirt.c) + +AC_INIT(libvirt, 0.3.2) +AC_CONFIG_SRCDIR(src/libvirt.c) AM_CONFIG_HEADER(config.h) +dnl Make automake keep quiet about wildcards & other GNUmake-isms +AM_INIT_AUTOMAKE([-Wno-portability]) AC_CANONICAL_HOST -LIBVIRT_MAJOR_VERSION=0 -LIBVIRT_MINOR_VERSION=3 -LIBVIRT_MICRO_VERSION=2 -LIBVIRT_MICRO_VERSION_SUFFIX= +LIBVIRT_MAJOR_VERSION=`echo $VERSION | awk -F . '{print $1}'` +LIBVIRT_MINOR_VERSION=`echo $VERSION | awk -F . '{print $2}'` +LIBVIRT_MICRO_VERSION=`echo $VERSION | awk -F . '{print $3}'` LIBVIRT_VERSION=$LIBVIRT_MAJOR_VERSION.$LIBVIRT_MINOR_VERSION.$LIBVIRT_MICRO_VERSION$LIBVIRT_MICRO_VERSION_SUFFIX LIBVIRT_VERSION_INFO=`expr $LIBVIRT_MAJOR_VERSION + $LIBVIRT_MINOR_VERSION`:$LIBVIRT_MICRO_VERSION:$LIBVIRT_MINOR_VERSION - LIBVIRT_VERSION_NUMBER=`expr $LIBVIRT_MAJOR_VERSION \* 1000000 + $LIBVIRT_MINOR_VERSION \* 1000 + $LIBVIRT_MICRO_VERSION` -if test -f CVS/Entries; then - extra=`grep ChangeLog CVS/Entries | grep -v LIBVIR | sed -e s\%/ChangeLog/1\.%% -e s\%/.*$%%` - echo extra=$extra - if test "$extra" != "" - then - LIBVIRT_VERSION_EXTRA="-CVS$extra" - fi -fi - AC_SUBST(LIBVIRT_MAJOR_VERSION) AC_SUBST(LIBVIRT_MINOR_VERSION) AC_SUBST(LIBVIRT_MICRO_VERSION) AC_SUBST(LIBVIRT_VERSION) AC_SUBST(LIBVIRT_VERSION_INFO) AC_SUBST(LIBVIRT_VERSION_NUMBER) -AC_SUBST(LIBVIRT_VERSION_EXTRA) - -VERSION=${LIBVIRT_VERSION} - -AM_INIT_AUTOMAKE(libvirt, $VERSION) dnl Checks for programs. AC_PROG_CC