> > Oh, BTW, also changed the behavior of AC_OUTPUT in configure.ac, > as passing arguments to AC_OUTPUT is deprecated. > > Can you re-submit that one in a separated patch? >
Attached. Cheers, -Aleksander
# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: [email protected] # target_branch: file:///home/aleksander/Development/gnu/libgnupdf\ # /trunk/ # testament_sha1: f3400552fb2a99e710443f22d41c9ade63f31f73 # timestamp: 2010-04-05 21:36:15 +0200 # base_revision_id: jema...@termi-20100401101915-8btwrgmis308tct3 # # Begin patch === modified file 'ChangeLog' --- ChangeLog 2010-04-01 10:14:36 +0000 +++ ChangeLog 2010-04-05 19:35:57 +0000 @@ -1,3 +1,8 @@ +2010-04-05 Aleksander Morgado <[email protected]> + + * configure.ac: AC_OUTPUT with arguments is deprecated. Use the + AC_CONFIG_FILES and AC_OUTPUT pair instead. + 2010-04-01 Jose E. Marchesi <[email protected]> * torture/unit/base/fp/pdf-fp-func-4-new.c === modified file 'configure.ac' --- configure.ac 2010-03-29 19:07:36 +0000 +++ configure.ac 2010-04-05 19:35:57 +0000 @@ -162,10 +162,10 @@ dnl level\layer | base | object | document | page | dnl ------------+------+--------+----------+------+ dnl 0 | * | | | | -dnl 1 | * | * | | | +dnl 1 | * | * | | | dnl 2 | * | * | * | | dnl 3 | * | * | * | * | -dnl +dnl dnl Note that the base layer is always included in the library dnl regardless the compilation level. @@ -186,11 +186,11 @@ dnl Project management resources AC_ARG_ENABLE([prmgt], AS_HELP_STRING([--enable-prmgt], - [build project management resources (default is NO)]), + [build project management resources (default is NO)]), [prmgt_mode=$enableval], [prmgt_mode=no]) AM_CONDITIONAL([PRMGT],[test "x$prmgt_mode" = "xyes"]) -if test "x$prmgt_mode" = "xyes" ; then +if test "x$prmgt_mode" = "xyes" ; then if test "x$have_taskjuggler" = "xyes" ; then AC_CHECK_PROG([have_dot], [dot], [yes], [no],,) @@ -218,25 +218,25 @@ # debug_*_mode PDFLIB_DEBUG_DESCR="" AC_ARG_ENABLE([debug-base], AS_HELP_STRING([--enable-debug-base], - [debug mode at the base layer (default is NO)]), + [debug mode at the base layer (default is NO)]), [debug_base_mode=$enableval], [debug_base_mode=no]) AC_ARG_ENABLE([debug-object], AS_HELP_STRING([--enable-debug-object], - [debug mode at the object layer (default is NO)]), + [debug mode at the object layer (default is NO)]), [debug_object_mode=$enableval], [debug_object_mode=no]) AC_ARG_ENABLE([debug-document], AS_HELP_STRING([--enable-debug-document], - [debug mode at the document layer (default is NO)]), + [debug mode at the document layer (default is NO)]), [debug_document_mode=$enableval], [debug_document_mode=no]) AC_ARG_ENABLE([debug-page], AS_HELP_STRING([--enable-debug-page], - [debug mode at the page layer (default is NO)]), + [debug mode at the page layer (default is NO)]), [debug_page_mode=$enableval], [debug_page_mode=no]) if test "x$debug_base_mode" = "xyes"; then AC_DEFINE([HAVE_DEBUG_BASE], [1], [Debugging Base Layer]) PDFLIB_DEBUG_DESCR="base, " -fi +fi if test "x$debug_object_mode" = "xyes"; then AC_DEFINE([HAVE_DEBUG_OBJECT], [1], [Debugging Object Layer]) PDFLIB_DEBUG_DESCR="${PDFLIB_DEBUG_DESCR}object, " @@ -283,7 +283,7 @@ dnl nocheck (simple replacement of Check framework when this is not available) AC_ARG_ENABLE([nocheck], AS_HELP_STRING([--enable-nocheck], - [Use built-in nocheck instead of Check (default is NO)]), + [Use built-in nocheck instead of Check (default is NO)]), [use_nocheck=$enableval], [use_nocheck=no]) if test "x$use_nocheck" = "xyes"; then AC_DEFINE([HAVE_NOCHECK], [1], [Use No-Check instead of Check]) @@ -321,7 +321,28 @@ AC_SUBST(GNUPDF_VERSION) dnl Generate output files -AC_OUTPUT(Makefile lib/Makefile src/Makefile torture/Makefile torture/testdata/Makefile torture/unit/Makefile doc/Makefile utils/Makefile prmgt/Makefile prmgt/apic2wiki prmgt/testlog2wiki prmgt/docfuncs prmgt/tsdfuncs src/extract-public-hdr build-aux/Makefile prmgt/get-test-data.sh prmgt/srcinfo-extractor.pl doc/version.texi prmgt/check-api-doc-consistency.pl doc/generate-tsd.pl libgnupdf.pc) +AC_CONFIG_FILES([Makefile + libgnupdf.pc + build-aux/Makefile + lib/Makefile + src/Makefile + src/extract-public-hdr + torture/Makefile + torture/testdata/Makefile + torture/unit/Makefile + utils/Makefile + prmgt/Makefile + prmgt/apic2wiki + prmgt/testlog2wiki + prmgt/docfuncs + prmgt/tsdfuncs + prmgt/get-test-data.sh + prmgt/srcinfo-extractor.pl + prmgt/check-api-doc-consistency.pl + doc/Makefile + doc/version.texi + doc/generate-tsd.pl]) +AC_OUTPUT dnl Report configuration results @@ -356,7 +377,7 @@ if test "x$have_zlib" = "xno" ; then echo " -WARNING: you are going to build a library without FlateDecode support. +WARNING: you are going to build a library without FlateDecode support. That means you will not be able to process many PDF files." fi # Begin bundle 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 igCo1LVuWaVtmCWIMH+qPqz//F3JFOFCQeQgwRw=
