diff --git a/livesupport/doc/developmentTools.html b/livesupport/doc/developmentTools.html index 48f41b85b..585361e25 100644 --- a/livesupport/doc/developmentTools.html +++ b/livesupport/doc/developmentTools.html @@ -3,7 +3,7 @@ LiveSupport developer tools - +

Preface

@@ -12,8 +12,8 @@ project, Copyright © 2004 Media Development Loan Fund, under the GNU GPL.
@@ -33,8 +33,8 @@ The following tools are expected on the development system:
  • gcc >= 3.3
  • make >= 3.80
    • -
  • automake < -1.8
    • +
  • automake
    +
  • autoconf >= 2.5
    (If you have an older version installed as well, don't forget to set diff --git a/livesupport/modules/authentication/bin/autogen.sh b/livesupport/modules/authentication/bin/autogen.sh index 30e64acb8..a34a11013 100755 --- a/livesupport/modules/authentication/bin/autogen.sh +++ b/livesupport/modules/authentication/bin/autogen.sh @@ -22,7 +22,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.5 $ +# Version : $Revision: 1.6 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/authentication/bin/autogen.sh,v $ #------------------------------------------------------------------------------- @@ -76,12 +76,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} diff --git a/livesupport/modules/authentication/etc/Makefile.in b/livesupport/modules/authentication/etc/Makefile.in index cb6dad6de..421d02cb0 100644 --- a/livesupport/modules/authentication/etc/Makefile.in +++ b/livesupport/modules/authentication/etc/Makefile.in @@ -20,8 +20,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Author : $Author: fgerlits $ -# Version : $Revision: 1.8 $ +# Author : $Author: maroy $ +# Version : $Revision: 1.9 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/authentication/etc/Makefile.in,v $ # # @configure_input@ @@ -141,7 +141,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 check: all ${TEST_RUNNER} ${MAKE} -C ${STORAGE_SERVER_DIR} diff --git a/livesupport/modules/core/bin/autogen.sh b/livesupport/modules/core/bin/autogen.sh index d0760abcf..9e1aed3b9 100755 --- a/livesupport/modules/core/bin/autogen.sh +++ b/livesupport/modules/core/bin/autogen.sh @@ -22,7 +22,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.4 $ +# Version : $Revision: 1.5 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/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} diff --git a/livesupport/modules/core/etc/Makefile.in b/livesupport/modules/core/etc/Makefile.in index e55c5d01c..1a5f10941 100644 --- a/livesupport/modules/core/etc/Makefile.in +++ b/livesupport/modules/core/etc/Makefile.in @@ -20,8 +20,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Author : $Author: fgerlits $ -# Version : $Revision: 1.30 $ +# Author : $Author: maroy $ +# Version : $Revision: 1.31 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/core/etc/Makefile.in,v $ # # @configure_input@ @@ -182,7 +182,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 check: ${TEST_RUNNER} ${TEST_RUNNER_RES} ${TEST_RUNNER} -o ${TEST_RESULTS} -s ${TEST_XSLT} diff --git a/livesupport/modules/db/bin/autogen.sh b/livesupport/modules/db/bin/autogen.sh index 4429b9224..90c9517e4 100755 --- a/livesupport/modules/db/bin/autogen.sh +++ b/livesupport/modules/db/bin/autogen.sh @@ -22,7 +22,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.4 $ +# Version : $Revision: 1.5 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/db/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} diff --git a/livesupport/modules/db/etc/Makefile.in b/livesupport/modules/db/etc/Makefile.in index 8e53c8ae9..7a52b87a1 100644 --- a/livesupport/modules/db/etc/Makefile.in +++ b/livesupport/modules/db/etc/Makefile.in @@ -21,7 +21,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.9 $ +# Version : $Revision: 1.10 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/db/etc/Makefile.in,v $ # # @configure_input@ @@ -140,7 +140,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 check: all ${TEST_RUNNER} ${TEST_RUNNER} -o ${TEST_RESULTS} -s ${TEST_XSLT} diff --git a/livesupport/modules/eventScheduler/bin/autogen.sh b/livesupport/modules/eventScheduler/bin/autogen.sh index 027e40261..f810b56ff 100755 --- a/livesupport/modules/eventScheduler/bin/autogen.sh +++ b/livesupport/modules/eventScheduler/bin/autogen.sh @@ -22,7 +22,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.4 $ +# Version : $Revision: 1.5 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/eventScheduler/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} diff --git a/livesupport/modules/eventScheduler/etc/Makefile.in b/livesupport/modules/eventScheduler/etc/Makefile.in index 26be194b5..64146b771 100644 --- a/livesupport/modules/eventScheduler/etc/Makefile.in +++ b/livesupport/modules/eventScheduler/etc/Makefile.in @@ -21,7 +21,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.6 $ +# Version : $Revision: 1.7 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/eventScheduler/etc/Makefile.in,v $ # # @configure_input@ @@ -138,7 +138,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 check: all ${TEST_RUNNER} ${TEST_RUNNER} -o ${TEST_RESULTS} -s ${TEST_XSLT} diff --git a/livesupport/modules/gstreamerElements/bin/autogen.sh b/livesupport/modules/gstreamerElements/bin/autogen.sh index d5ebc2eea..f5cbda9f5 100755 --- a/livesupport/modules/gstreamerElements/bin/autogen.sh +++ b/livesupport/modules/gstreamerElements/bin/autogen.sh @@ -22,7 +22,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.1 $ +# Version : $Revision: 1.2 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/gstreamerElements/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} diff --git a/livesupport/modules/gstreamerElements/etc/Makefile.in b/livesupport/modules/gstreamerElements/etc/Makefile.in index 16b3288b6..8a967dfc3 100644 --- a/livesupport/modules/gstreamerElements/etc/Makefile.in +++ b/livesupport/modules/gstreamerElements/etc/Makefile.in @@ -21,7 +21,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.8 $ +# Version : $Revision: 1.9 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/gstreamerElements/etc/Makefile.in,v $ # # @configure_input@ @@ -200,7 +200,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 check: all ${TEST_RUNNER} ${TEST_RUNNER} -o ${TEST_RESULTS} -s ${TEST_XSLT} diff --git a/livesupport/modules/playlistExecutor/bin/autogen.sh b/livesupport/modules/playlistExecutor/bin/autogen.sh index 0e6ac653f..5346603c7 100755 --- a/livesupport/modules/playlistExecutor/bin/autogen.sh +++ b/livesupport/modules/playlistExecutor/bin/autogen.sh @@ -22,7 +22,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.4 $ +# Version : $Revision: 1.5 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/playlistExecutor/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} diff --git a/livesupport/modules/playlistExecutor/etc/Makefile.in b/livesupport/modules/playlistExecutor/etc/Makefile.in index bafd6233b..f48ecfea9 100644 --- a/livesupport/modules/playlistExecutor/etc/Makefile.in +++ b/livesupport/modules/playlistExecutor/etc/Makefile.in @@ -21,7 +21,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.16 $ +# Version : $Revision: 1.17 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/playlistExecutor/etc/Makefile.in,v $ # # @configure_input@ @@ -167,7 +167,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 check: all ${TEST_RUNNER} ${TEST_RUNNER} -o ${TEST_RESULTS} -s ${TEST_XSLT} diff --git a/livesupport/modules/schedulerClient/bin/autogen.sh b/livesupport/modules/schedulerClient/bin/autogen.sh index d3cbc8c5e..4a4155001 100755 --- a/livesupport/modules/schedulerClient/bin/autogen.sh +++ b/livesupport/modules/schedulerClient/bin/autogen.sh @@ -22,7 +22,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.4 $ +# Version : $Revision: 1.5 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/schedulerClient/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} diff --git a/livesupport/modules/schedulerClient/etc/Makefile.in b/livesupport/modules/schedulerClient/etc/Makefile.in index a67ca6489..5dd477492 100644 --- a/livesupport/modules/schedulerClient/etc/Makefile.in +++ b/livesupport/modules/schedulerClient/etc/Makefile.in @@ -21,7 +21,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.7 $ +# Version : $Revision: 1.8 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/schedulerClient/etc/Makefile.in,v $ # # @configure_input@ @@ -164,7 +164,7 @@ depclean: clean ${MAKE} -C ${CORE_DIR} clean distclean: clean docclean - ${RMDIR} ${TMP_DIR}/config* ${TMP_DIR}/autom4te* + ${RMDIR} ${TMP_DIR}/config* ${TMP_DIR}/autom4te* ${TMP_DIR}/ac*.m4 check: all ${TEST_RUNNER} install start run_tests stop uninstall diff --git a/livesupport/modules/storage/bin/autogen.sh b/livesupport/modules/storage/bin/autogen.sh index 3bfda893d..0eaeb4a67 100755 --- a/livesupport/modules/storage/bin/autogen.sh +++ b/livesupport/modules/storage/bin/autogen.sh @@ -22,7 +22,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.4 $ +# Version : $Revision: 1.5 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/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} diff --git a/livesupport/modules/storage/etc/Makefile.in b/livesupport/modules/storage/etc/Makefile.in index cfd4fac13..15bf26d62 100644 --- a/livesupport/modules/storage/etc/Makefile.in +++ b/livesupport/modules/storage/etc/Makefile.in @@ -20,8 +20,8 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # -# Author : $Author: fgerlits $ -# Version : $Revision: 1.22 $ +# Author : $Author: maroy $ +# Version : $Revision: 1.23 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storage/etc/Makefile.in,v $ # # @configure_input@ @@ -157,7 +157,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 check: all ${TEST_RUNNER} storage_server_init ${TEST_RUNNER} -o ${TEST_RESULTS} -s ${TEST_XSLT} diff --git a/livesupport/modules/widgets/bin/autogen.sh b/livesupport/modules/widgets/bin/autogen.sh index a9dcb2ca8..770fb68e0 100755 --- a/livesupport/modules/widgets/bin/autogen.sh +++ b/livesupport/modules/widgets/bin/autogen.sh @@ -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} diff --git a/livesupport/modules/widgets/etc/Makefile.in b/livesupport/modules/widgets/etc/Makefile.in index 4dc1915da..19e59ee9f 100644 --- a/livesupport/modules/widgets/etc/Makefile.in +++ b/livesupport/modules/widgets/etc/Makefile.in @@ -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} diff --git a/livesupport/products/gLiveSupport/bin/autogen.sh b/livesupport/products/gLiveSupport/bin/autogen.sh index 31704ddf2..782f850f5 100755 --- a/livesupport/products/gLiveSupport/bin/autogen.sh +++ b/livesupport/products/gLiveSupport/bin/autogen.sh @@ -22,7 +22,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.8 $ +# Version : $Revision: 1.9 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/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 -o ${configure} ${configure_ac}" autoconf -I ${tmpdir} -o ${configure} ${configure_ac} diff --git a/livesupport/products/gLiveSupport/etc/Makefile.in b/livesupport/products/gLiveSupport/etc/Makefile.in index 5f3636932..7108be82a 100644 --- a/livesupport/products/gLiveSupport/etc/Makefile.in +++ b/livesupport/products/gLiveSupport/etc/Makefile.in @@ -21,7 +21,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.46 $ +# Version : $Revision: 1.47 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/etc/Makefile.in,v $ # # @configure_input@ @@ -271,7 +271,7 @@ depclean: clean ${MAKE} -C ${CORE_DIR} clean distclean: clean docclean - ${RMDIR} ${TMP_DIR}/config* ${TMP_DIR}/autom4te* ${TMP_DIR}/*.m4 + ${RMDIR} ${TMP_DIR}/config* ${TMP_DIR}/autom4te* ${TMP_DIR}/ac*.m4 check: all ${TEST_RUNNER} storage_server_init run_tests diff --git a/livesupport/products/scheduler/bin/autogen.sh b/livesupport/products/scheduler/bin/autogen.sh index 4bfa9cff7..e41d08660 100755 --- a/livesupport/products/scheduler/bin/autogen.sh +++ b/livesupport/products/scheduler/bin/autogen.sh @@ -22,7 +22,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.4 $ +# Version : $Revision: 1.5 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/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} diff --git a/livesupport/products/scheduler/etc/Makefile.in b/livesupport/products/scheduler/etc/Makefile.in index fa4e5e4ad..928d4c6ce 100644 --- a/livesupport/products/scheduler/etc/Makefile.in +++ b/livesupport/products/scheduler/etc/Makefile.in @@ -21,7 +21,7 @@ # # # Author : $Author: maroy $ -# Version : $Revision: 1.62 $ +# Version : $Revision: 1.63 $ # Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/etc/Makefile.in,v $ # # @configure_input@ @@ -305,7 +305,7 @@ depclean: clean ${MAKE} -C ${CORE_DIR} clean distclean: clean docclean - ${RMDIR} ${TMP_DIR}/config* ${TMP_DIR}/autom4te* + ${RMDIR} ${TMP_DIR}/config* ${TMP_DIR}/autom4te* ${TMP_DIR}/ac*.m4 check: all ${TEST_RUNNER} storage_server_init start run_tests stop