Put all macros in the m4 directory, this avoids cluttering the main directory with libtool 2.2 (that split the macros in multiple files).
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
# $Id: Makefile.am,v 1.48 2008/06/13 15:54:49 flameeyes Exp $
|
# $Id: Makefile.am,v 1.49 2008/06/16 22:36:14 flameeyes Exp $
|
||||||
#
|
#
|
||||||
# Copyright (C) 2003, 2004, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
|
# Copyright (C) 2003, 2004, 2006, 2008 Rocky Bernstein <rocky@gnu.org>
|
||||||
#
|
#
|
||||||
@@ -130,6 +130,6 @@ if MAINTAINER_MODE
|
|||||||
ChangeLog:
|
ChangeLog:
|
||||||
( cd $(srcdir); $(CVS2CL) -W 450 --header cvs2cl_header --utc -w -I ChangeLog --usermap cvs2cl_usermap -P --stdout ) > ChangeLog
|
( cd $(srcdir); $(CVS2CL) -W 450 --header cvs2cl_header --utc -w -I ChangeLog --usermap cvs2cl_usermap -P --stdout ) > ChangeLog
|
||||||
|
|
||||||
ACLOCAL_AMFLAGS=-I .
|
ACLOCAL_AMFLAGS=-I m4
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ define(RELEASE_NUM, 81)
|
|||||||
define(CDIO_VERSION_STR, 0.$1cvs)
|
define(CDIO_VERSION_STR, 0.$1cvs)
|
||||||
|
|
||||||
AC_PREREQ(2.52)
|
AC_PREREQ(2.52)
|
||||||
AC_REVISION([$Id: configure.ac,v 1.228 2008/06/14 22:41:29 rocky Exp $])dnl
|
AC_REVISION([$Id: configure.ac,v 1.229 2008/06/16 22:36:09 flameeyes Exp $])dnl
|
||||||
AC_INIT(libcdio, CDIO_VERSION_STR(RELEASE_NUM))
|
AC_INIT(libcdio, CDIO_VERSION_STR(RELEASE_NUM))
|
||||||
AC_CONFIG_SRCDIR(src/cd-info.c)
|
AC_CONFIG_SRCDIR(src/cd-info.c)
|
||||||
|
|
||||||
@@ -32,6 +32,7 @@ AM_INIT_AUTOMAKE([1.7])
|
|||||||
|
|
||||||
AC_CANONICAL_HOST
|
AC_CANONICAL_HOST
|
||||||
AM_CONFIG_HEADER(config.h)
|
AM_CONFIG_HEADER(config.h)
|
||||||
|
AC_CONFIG_MACRO_DIR([m4])
|
||||||
|
|
||||||
LIBCDIO_VERSION_NUM=`echo RELEASE_NUM | cut -d . -f 1 | tr -d a-z`
|
LIBCDIO_VERSION_NUM=`echo RELEASE_NUM | cut -d . -f 1 | tr -d a-z`
|
||||||
AC_SUBST(LIBCDIO_VERSION_NUM)
|
AC_SUBST(LIBCDIO_VERSION_NUM)
|
||||||
|
|||||||
Reference in New Issue
Block a user