diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-0 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-10 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-2 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-4 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-6 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-1-8 | 7 | ||||
| -rw-r--r-- | configure.in | 7 | ||||
| -rw-r--r-- | docs/Makefile.am | 15 |
9 files changed, 60 insertions, 11 deletions
@@ -4,6 +4,13 @@ Thu Oct 25 11:06:54 2001 Owen Taylor <otaylor@redhat.com> * NEWS: Updates. +Fri Oct 26 12:32:25 2001 Owen Taylor <otaylor@redhat.com> + + * configure.in: Don't use AC_CHECK_LIB to check for + win32, since that causes problems with autoconf-2.13. + + * docs/Makefile.am: Fix to install images. + Thu Oct 25 11:05:01 2001 Owen Taylor <otaylor@redhat.com> * pango/pango-layout.c (pango_layout_run_get_extents): Allow diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0 index 978df7f3..b774cc5a 100644 --- a/ChangeLog.pre-1-0 +++ b/ChangeLog.pre-1-0 @@ -4,6 +4,13 @@ Thu Oct 25 11:06:54 2001 Owen Taylor <otaylor@redhat.com> * NEWS: Updates. +Fri Oct 26 12:32:25 2001 Owen Taylor <otaylor@redhat.com> + + * configure.in: Don't use AC_CHECK_LIB to check for + win32, since that causes problems with autoconf-2.13. + + * docs/Makefile.am: Fix to install images. + Thu Oct 25 11:05:01 2001 Owen Taylor <otaylor@redhat.com> * pango/pango-layout.c (pango_layout_run_get_extents): Allow diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10 index 978df7f3..b774cc5a 100644 --- a/ChangeLog.pre-1-10 +++ b/ChangeLog.pre-1-10 @@ -4,6 +4,13 @@ Thu Oct 25 11:06:54 2001 Owen Taylor <otaylor@redhat.com> * NEWS: Updates. +Fri Oct 26 12:32:25 2001 Owen Taylor <otaylor@redhat.com> + + * configure.in: Don't use AC_CHECK_LIB to check for + win32, since that causes problems with autoconf-2.13. + + * docs/Makefile.am: Fix to install images. + Thu Oct 25 11:05:01 2001 Owen Taylor <otaylor@redhat.com> * pango/pango-layout.c (pango_layout_run_get_extents): Allow diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2 index 978df7f3..b774cc5a 100644 --- a/ChangeLog.pre-1-2 +++ b/ChangeLog.pre-1-2 @@ -4,6 +4,13 @@ Thu Oct 25 11:06:54 2001 Owen Taylor <otaylor@redhat.com> * NEWS: Updates. +Fri Oct 26 12:32:25 2001 Owen Taylor <otaylor@redhat.com> + + * configure.in: Don't use AC_CHECK_LIB to check for + win32, since that causes problems with autoconf-2.13. + + * docs/Makefile.am: Fix to install images. + Thu Oct 25 11:05:01 2001 Owen Taylor <otaylor@redhat.com> * pango/pango-layout.c (pango_layout_run_get_extents): Allow diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4 index 978df7f3..b774cc5a 100644 --- a/ChangeLog.pre-1-4 +++ b/ChangeLog.pre-1-4 @@ -4,6 +4,13 @@ Thu Oct 25 11:06:54 2001 Owen Taylor <otaylor@redhat.com> * NEWS: Updates. +Fri Oct 26 12:32:25 2001 Owen Taylor <otaylor@redhat.com> + + * configure.in: Don't use AC_CHECK_LIB to check for + win32, since that causes problems with autoconf-2.13. + + * docs/Makefile.am: Fix to install images. + Thu Oct 25 11:05:01 2001 Owen Taylor <otaylor@redhat.com> * pango/pango-layout.c (pango_layout_run_get_extents): Allow diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6 index 978df7f3..b774cc5a 100644 --- a/ChangeLog.pre-1-6 +++ b/ChangeLog.pre-1-6 @@ -4,6 +4,13 @@ Thu Oct 25 11:06:54 2001 Owen Taylor <otaylor@redhat.com> * NEWS: Updates. +Fri Oct 26 12:32:25 2001 Owen Taylor <otaylor@redhat.com> + + * configure.in: Don't use AC_CHECK_LIB to check for + win32, since that causes problems with autoconf-2.13. + + * docs/Makefile.am: Fix to install images. + Thu Oct 25 11:05:01 2001 Owen Taylor <otaylor@redhat.com> * pango/pango-layout.c (pango_layout_run_get_extents): Allow diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8 index 978df7f3..b774cc5a 100644 --- a/ChangeLog.pre-1-8 +++ b/ChangeLog.pre-1-8 @@ -4,6 +4,13 @@ Thu Oct 25 11:06:54 2001 Owen Taylor <otaylor@redhat.com> * NEWS: Updates. +Fri Oct 26 12:32:25 2001 Owen Taylor <otaylor@redhat.com> + + * configure.in: Don't use AC_CHECK_LIB to check for + win32, since that causes problems with autoconf-2.13. + + * docs/Makefile.am: Fix to install images. + Thu Oct 25 11:05:01 2001 Owen Taylor <otaylor@redhat.com> * pango/pango-layout.c (pango_layout_run_get_extents): Allow diff --git a/configure.in b/configure.in index 96ecbcc9..3ec19b51 100644 --- a/configure.in +++ b/configure.in @@ -153,7 +153,12 @@ AM_CONDITIONAL(HAVE_XFT, $have_xft) have_win32=false WIN32_LIBS="" WIN32_CFLAGS="" -AC_CHECK_LIB(gdi32, GetTextMetricsA@8, have_win32=true, : ) +# The following doesn't work with autoconf-2.13, so we check $host instead +# AC_CHECK_LIB(gdi32, GetTextMetricsA@8, have_win32=true, : ) +case "$host" in + *-*-mingw*|*-*-cygwin*) have_win32=true ;; +esac + if test $have_win32 = true; then WIN32_LIBS="-lgdi32" diff --git a/docs/Makefile.am b/docs/Makefile.am index 6cbba4c3..6087fc47 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -141,7 +141,8 @@ sgml.stamp: sgml-build.stamp html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) @echo '*** Building HTML ***' - test -d $(srcdir)/html || mkdir $(srcdir)/html + rm -rf $(srcdir)/html + mkdir $(srcdir)/html cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) @echo '-- Fixing Crossreferences' @@ -159,8 +160,8 @@ maintainer-clean-local: clean install-data-local: $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR) - (installfiles=`echo $(srcdir)/html/*.html`; \ - if test "$$installfiles" = '$(srcdir)/html/*.html'; \ + (installfiles=`echo $(srcdir)/html/*`; \ + if test "$$installfiles" = '$(srcdir)/html/*'; \ then echo '-- Nothing to install' ; \ else \ for i in $$installfiles; do \ @@ -188,12 +189,6 @@ dist-hook: dist-check-gtkdoc dist-hook-local mkdir $(distdir)/html -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl -cp $(srcdir)/sgml/*.sgml $(distdir)/sgml - cp $(srcdir)/html/index.sgml $(distdir)/html - -cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html - - images=$(HTML_IMAGES) ; \ - for i in $$images ; do \ - cp $(srcdir)/$$i $(distdir)/html ; \ - done + -cp $(srcdir)/html/* $(distdir)/html .PHONY : dist-hook-local |