Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

removed dependency on automake versions <= 1.8

Browse source 
now 1.8 and newer can also be used
This commit is contained in:
maroy 2005-07-03 09:34:51 +00:00
parent f767ed2dd8
commit 1e94527522
23 changed files with 152 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

15
livesupport/modules/widgets/bin/autogen.sh
View file

@ -22,7 +22,7 @@
#
#
# Author : $Author: maroy $
# Version : $Revision: 1.1 $
# Version : $Revision: 1.2 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/widgets/bin/autogen.sh,v $
#-------------------------------------------------------------------------------
@ -77,12 +77,19 @@ configure_ac=${etcdir}/configure.ac
configure=${tmpdir}/configure
aclocal_m4=${tmpdir}/aclocal.m4
# run aclocal in etc, as it's blind, only sees files in the current directory
ACLOCAL_FLAGS="--output=${aclocal_m4}"
# copy over configure.ac and acinlclude.m4 from etc to tmp,
# as aclocal >= 1.8 is sooo unbelivably stupid that it will simply try to
# look for configure.ac in the current directory, and include acinclude.m4
# in aclocal.m4 it without a directory path in front
ACLOCAL_FLAGS="-I ${tmpdir} --acdir=${tmpdir} --output=${aclocal_m4}"
echo " aclocal $ACLOCAL_FLAGS"
cd ${etcdir} && aclocal $ACLOCAL_FLAGS ; cd ${tmpdir}
cp -f ${configure_ac} ${tmpdir}
cp -f ${etcdir}/acinclude.m4 ${tmpdir}
aclocal $ACLOCAL_FLAGS
echo " autoheader ${configure_ac}"
autoheader ${configure_ac}
echo " autoconf -I ${tmpdir} -o ${configure} ${configure_ac}"
autoconf -I ${tmpdir} -o ${configure} ${configure_ac}

6
livesupport/modules/widgets/etc/Makefile.in
View file

@ -20,8 +20,8 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
#
# Author : $Author: fgerlits $
# Version : $Revision: 1.19 $
# Author : $Author: maroy $
# Version : $Revision: 1.20 $
# Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/widgets/etc/Makefile.in,v $
#
# @configure_input@
@ -177,7 +177,7 @@ docclean:
depclean: clean
distclean: clean docclean
${RMDIR} ${TMP_DIR}/config* ${TMP_DIR}/autom4te*
${RMDIR} ${TMP_DIR}/config* ${TMP_DIR}/autom4te* ${TMP_DIR}/ac*.m4
run: all ${TEST_EXE} ${TEST_RUNNER_RES}
${TEST_EXE} -c ${TEST_CFG}