From: Adam Dickmeiss Date: Mon, 15 Apr 2002 09:43:30 +0000 (+0000) Subject: Using AM_CXXFLAGS instead of CXXFLAGS X-Git-Tag: YAZPP.0.3~17 X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=commitdiff_plain;h=8a1224da4d5c0d6bde27b39d1ec0f9b6ffa6aea0 Using AM_CXXFLAGS instead of CXXFLAGS --- diff --git a/buildconf.sh b/buildconf.sh index 071751e..02252f6 100755 --- a/buildconf.sh +++ b/buildconf.sh @@ -1,13 +1,13 @@ #!/bin/sh -# $Id: buildconf.sh,v 1.6 2001-03-26 14:43:49 adam Exp $ +# $Id: buildconf.sh,v 1.7 2002-04-15 09:43:30 adam Exp $ dir=`aclocal --print-ac-dir` if [ -f $dir/yaz.m4 ]; then - aclocal || exit 1 + aclocal else - aclocal -I . || exit 1 + aclocal -I . fi -libtoolize --force >/dev/null 2>&1 || exit 2 -automake -a >/dev/null 2>&1 || exit 3 +libtoolize --force +automake -a autoconf || exit 4 if [ -f config.cache ]; then rm config.cache diff --git a/src/Makefile.am b/src/Makefile.am index bccdfab..459e973 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ -## $Id: Makefile.am,v 1.9 2001-11-06 17:08:05 adam Exp $ +## $Id: Makefile.am,v 1.10 2002-04-15 09:43:30 adam Exp $ -CXXFLAGS = $(YAZINC) -I$(srcdir)/../include +AM_CXXFLAGS = $(YAZINC) -I$(srcdir)/../include lib_LTLIBRARIES = libyaz++.la