summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog19
-rw-r--r--ChangeLog.pre-1-019
-rw-r--r--ChangeLog.pre-1-1019
-rw-r--r--ChangeLog.pre-1-219
-rw-r--r--ChangeLog.pre-1-419
-rw-r--r--ChangeLog.pre-1-619
-rw-r--r--ChangeLog.pre-1-819
-rw-r--r--Makefile.am23
-rw-r--r--configure.in46
-rw-r--r--pango/Makefile.am7
-rw-r--r--pangoft2.pc.in2
-rw-r--r--pangox.pc.in2
-rw-r--r--pangoxft.pc.in2
-rwxr-xr-xsanitize-la.sh3
14 files changed, 212 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 4aba9959..b2bb6400 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+Fri Mar 1 00:46:49 2002 Owen Taylor <otaylor@redhat.com>
+
+ * configure: Default to --disable-static.
+
+ * configure.in pangoft2.pc.in pangoxft2.pc.in pangox.pc.in:
+ Add a --enable-explicit-deps option to control whether dependency
+ libraries are written into .la files and .pc files.
+ Default is auto: if static libraries are off
+ and shlib dependencies are found, don't write deps.
+
+ * pango/Makefile.am sanitize-la.sh: Shell script used
+ to strip dependencies out of .la files.
+
+ * configure.in: Default to --disable-gtk-doc.
+
+ * Makefile.am: Add a slightly modified distcheck rule
+ that passes --enable-gtk-doc to the configure inside.
+ (So that 'make dist' succeeds inside.)
+
Fri Mar 1 14:37:47 2002 Owen Taylor <otaylor@redhat.com>
* pango/pangoxft-font.c (pango_xft_font_get_glyph_extents):
diff --git a/ChangeLog.pre-1-0 b/ChangeLog.pre-1-0
index 4aba9959..b2bb6400 100644
--- a/ChangeLog.pre-1-0
+++ b/ChangeLog.pre-1-0
@@ -1,3 +1,22 @@
+Fri Mar 1 00:46:49 2002 Owen Taylor <otaylor@redhat.com>
+
+ * configure: Default to --disable-static.
+
+ * configure.in pangoft2.pc.in pangoxft2.pc.in pangox.pc.in:
+ Add a --enable-explicit-deps option to control whether dependency
+ libraries are written into .la files and .pc files.
+ Default is auto: if static libraries are off
+ and shlib dependencies are found, don't write deps.
+
+ * pango/Makefile.am sanitize-la.sh: Shell script used
+ to strip dependencies out of .la files.
+
+ * configure.in: Default to --disable-gtk-doc.
+
+ * Makefile.am: Add a slightly modified distcheck rule
+ that passes --enable-gtk-doc to the configure inside.
+ (So that 'make dist' succeeds inside.)
+
Fri Mar 1 14:37:47 2002 Owen Taylor <otaylor@redhat.com>
* pango/pangoxft-font.c (pango_xft_font_get_glyph_extents):
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 4aba9959..b2bb6400 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,22 @@
+Fri Mar 1 00:46:49 2002 Owen Taylor <otaylor@redhat.com>
+
+ * configure: Default to --disable-static.
+
+ * configure.in pangoft2.pc.in pangoxft2.pc.in pangox.pc.in:
+ Add a --enable-explicit-deps option to control whether dependency
+ libraries are written into .la files and .pc files.
+ Default is auto: if static libraries are off
+ and shlib dependencies are found, don't write deps.
+
+ * pango/Makefile.am sanitize-la.sh: Shell script used
+ to strip dependencies out of .la files.
+
+ * configure.in: Default to --disable-gtk-doc.
+
+ * Makefile.am: Add a slightly modified distcheck rule
+ that passes --enable-gtk-doc to the configure inside.
+ (So that 'make dist' succeeds inside.)
+
Fri Mar 1 14:37:47 2002 Owen Taylor <otaylor@redhat.com>
* pango/pangoxft-font.c (pango_xft_font_get_glyph_extents):
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 4aba9959..b2bb6400 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,22 @@
+Fri Mar 1 00:46:49 2002 Owen Taylor <otaylor@redhat.com>
+
+ * configure: Default to --disable-static.
+
+ * configure.in pangoft2.pc.in pangoxft2.pc.in pangox.pc.in:
+ Add a --enable-explicit-deps option to control whether dependency
+ libraries are written into .la files and .pc files.
+ Default is auto: if static libraries are off
+ and shlib dependencies are found, don't write deps.
+
+ * pango/Makefile.am sanitize-la.sh: Shell script used
+ to strip dependencies out of .la files.
+
+ * configure.in: Default to --disable-gtk-doc.
+
+ * Makefile.am: Add a slightly modified distcheck rule
+ that passes --enable-gtk-doc to the configure inside.
+ (So that 'make dist' succeeds inside.)
+
Fri Mar 1 14:37:47 2002 Owen Taylor <otaylor@redhat.com>
* pango/pangoxft-font.c (pango_xft_font_get_glyph_extents):
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 4aba9959..b2bb6400 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,22 @@
+Fri Mar 1 00:46:49 2002 Owen Taylor <otaylor@redhat.com>
+
+ * configure: Default to --disable-static.
+
+ * configure.in pangoft2.pc.in pangoxft2.pc.in pangox.pc.in:
+ Add a --enable-explicit-deps option to control whether dependency
+ libraries are written into .la files and .pc files.
+ Default is auto: if static libraries are off
+ and shlib dependencies are found, don't write deps.
+
+ * pango/Makefile.am sanitize-la.sh: Shell script used
+ to strip dependencies out of .la files.
+
+ * configure.in: Default to --disable-gtk-doc.
+
+ * Makefile.am: Add a slightly modified distcheck rule
+ that passes --enable-gtk-doc to the configure inside.
+ (So that 'make dist' succeeds inside.)
+
Fri Mar 1 14:37:47 2002 Owen Taylor <otaylor@redhat.com>
* pango/pangoxft-font.c (pango_xft_font_get_glyph_extents):
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 4aba9959..b2bb6400 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,22 @@
+Fri Mar 1 00:46:49 2002 Owen Taylor <otaylor@redhat.com>
+
+ * configure: Default to --disable-static.
+
+ * configure.in pangoft2.pc.in pangoxft2.pc.in pangox.pc.in:
+ Add a --enable-explicit-deps option to control whether dependency
+ libraries are written into .la files and .pc files.
+ Default is auto: if static libraries are off
+ and shlib dependencies are found, don't write deps.
+
+ * pango/Makefile.am sanitize-la.sh: Shell script used
+ to strip dependencies out of .la files.
+
+ * configure.in: Default to --disable-gtk-doc.
+
+ * Makefile.am: Add a slightly modified distcheck rule
+ that passes --enable-gtk-doc to the configure inside.
+ (So that 'make dist' succeeds inside.)
+
Fri Mar 1 14:37:47 2002 Owen Taylor <otaylor@redhat.com>
* pango/pangoxft-font.c (pango_xft_font_get_glyph_extents):
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 4aba9959..b2bb6400 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,22 @@
+Fri Mar 1 00:46:49 2002 Owen Taylor <otaylor@redhat.com>
+
+ * configure: Default to --disable-static.
+
+ * configure.in pangoft2.pc.in pangoxft2.pc.in pangox.pc.in:
+ Add a --enable-explicit-deps option to control whether dependency
+ libraries are written into .la files and .pc files.
+ Default is auto: if static libraries are off
+ and shlib dependencies are found, don't write deps.
+
+ * pango/Makefile.am sanitize-la.sh: Shell script used
+ to strip dependencies out of .la files.
+
+ * configure.in: Default to --disable-gtk-doc.
+
+ * Makefile.am: Add a slightly modified distcheck rule
+ that passes --enable-gtk-doc to the configure inside.
+ (So that 'make dist' succeeds inside.)
+
Fri Mar 1 14:37:47 2002 Owen Taylor <otaylor@redhat.com>
* pango/pangoxft-font.c (pango_xft_font_get_glyph_extents):
diff --git a/Makefile.am b/Makefile.am
index 1a8e815b..ee8d3c67 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,3 +40,26 @@ pkgconfig_DATA = pango.pc $(X_PC) $(XFT_PC) $(FT2_PC) $(WIN32_PC)
dist-hook: pango.spec
cp pango.spec $(distdir)
+# This is a version of the automake-1.4 distcheck rule modified
+# to pass --enable-gtk-doc to ./configure
+#
+mydistcheck: dist
+ -rm -rf $(distdir)
+ GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
+ mkdir $(distdir)/=build
+ mkdir $(distdir)/=inst
+ dc_install_base=`cd $(distdir)/=inst && pwd`; \
+ cd $(distdir)/=build \
+ && ../configure --srcdir=.. --prefix=$$dc_install_base --enable-gtk-doc \
+ && $(MAKE) $(AM_MAKEFLAGS) \
+ && $(MAKE) $(AM_MAKEFLAGS) dvi \
+ && $(MAKE) $(AM_MAKEFLAGS) check \
+ && $(MAKE) $(AM_MAKEFLAGS) install \
+ && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+ && $(MAKE) $(AM_MAKEFLAGS) dist
+ -rm -rf $(distdir)
+ @banner="$(distdir).tar.gz is ready for distribution"; \
+ dashes=`echo "$$banner" | sed s/./=/g`; \
+ echo "$$dashes"; \
+ echo "$$banner"; \
+ echo "$$dashes"
diff --git a/configure.in b/configure.in
index 9f153fb7..b18af8f3 100644
--- a/configure.in
+++ b/configure.in
@@ -26,6 +26,7 @@ AM_CONDITIONAL(HAVE_CXX, test "$CXX" != "")
AC_LANG_RESTORE
AC_LIBTOOL_WIN32_DLL
+AM_DISABLE_STATIC
AM_PROG_LIBTOOL
AM_PROG_LEX
AC_PROG_YACC
@@ -68,8 +69,6 @@ if test "x$GCC" = "xyes"; then
fi
changequote([,])dnl
-AC_PATH_XTRA
-
AC_ARG_ENABLE(rebuilds, [ --disable-rebuilds disable all source autogeneration rules],,enable_rebuilds=yes)
# define a MAINT-like variable REBUILD which is set if Perl
@@ -85,6 +84,8 @@ if test "x$enable_rebuilds" = "xyes" && \
fi
AC_SUBST(REBUILD)
+AC_PATH_XTRA
+
if test x$no_x = xyes ; then
AC_MSG_WARN([X development libraries not found])
have_x=false
@@ -465,7 +466,7 @@ AC_CHECK_PROG(DB2HTML, db2html, true, false)
AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML)
dnl Let people disable the gtk-doc stuff.
-AC_ARG_ENABLE(gtk-doc, [ --enable-gtk-doc use gtk-doc to build documentation [default=auto]], enable_gtk_doc="$enableval", enable_gtk_doc=auto)
+AC_ARG_ENABLE(gtk-doc, [ --enable-gtk-doc use gtk-doc to build documentation [default=no]], enable_gtk_doc="$enableval", enable_gtk_doc=auto)
if test x$enable_gtk_doc = xauto ; then
if test x$GTKDOC = xtrue ; then
@@ -479,6 +480,45 @@ dnl NOTE: We need to use a separate automake conditional for this
dnl to make this work with the tarballs.
AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
+dnl ******************************************************
+dnl * See whether to include shared library dependencies *
+dnl ******************************************************
+
+AC_ARG_ENABLE(explicit-deps,
+ [ --enable-explicit-deps=[yes/no/auto] use explicit dependencies in .pc files [default=auto]],
+ enable_explicit_deps="$enableval",
+ enable_explicit_deps=auto)
+
+AC_MSG_CHECKING([Whether to write dependencies into .pc files])
+case $enable_explicit_deps in
+ auto)
+ deplib_check_method=`(./libtool --config; echo eval echo \\$deplib_check_method) | sh`
+ if test "X$deplib_check_method" == Xnone || test "x$enable_static" = xyes ; then
+ enable_explicit_deps=yes
+ else
+ enable_explicit_deps=no
+ fi
+ ;;
+ yes|no)
+ ;;
+ *) AC_MSG_ERROR([Value given to --enable-explicit-deps must be one of yes, no or auto])
+ ;;
+esac
+AC_MSG_RESULT($enable_explicit_deps)
+
+if test $enable_explicit_deps = yes ; then
+ PKGCONFIG_X_LIBS=$X_LIBS@ $X_EXTRA_LIBS
+ PKGCONFIG_XFT_LIBS=$XFT_LIBS
+ PKGCONFIG_FREETYPE_LIBS=$XFT_LIBS
+else
+ PKGCONFIG_X_LIBS=
+ PKGCONFIG_XFT_LIBS=
+ PKGCONFIG_FREETYPE_LIBS=
+fi
+AC_SUBST(PKGCONFIG_X_LIBS)
+AC_SUBST(PKGCONFIG_XFT_LIBS)
+AC_SUBST(PKGCONFIG_FREETYPE_LIBS)
+AM_CONDITIONAL(DISABLE_EXPLICIT_DEPS, test $enable_explicit_deps = no)
AC_OUTPUT_COMMANDS([
cat > pango/module-defs.h <<EOTEXT
diff --git a/pango/Makefile.am b/pango/Makefile.am
index 32e80277..952b11c4 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -313,4 +313,11 @@ pangowin32.lib: libpangowin32.la pangowin32.def
install-data-local: install-ms-lib install-libtool-import-lib
+if DISABLE_EXPLICIT_DEPS
+install-exec-local:
+ for i in libpangoft2.la libpangoxft.la libpangox.la ; do \
+ test -f $(DESTDIR)$(libdir)/$$i && $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/$$i ; \
+ done
+endif
+
uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
diff --git a/pangoft2.pc.in b/pangoft2.pc.in
index 89d0f881..626d9432 100644
--- a/pangoft2.pc.in
+++ b/pangoft2.pc.in
@@ -7,6 +7,6 @@ Name: Pango FT2
Description: Freetype 2.0 font support for Pango
Version: @VERSION@
Requires: pango
-Libs: -L${libdir} -lpangoft2 @FREETYPE_LIBS@
+Libs: -L${libdir} -lpangoft2 @PKGCONFIG_FREETYPE_LIBS@
Cflags: -I${includedir}/pango-1.0 @FREETYPE_CFLAGS@
diff --git a/pangox.pc.in b/pangox.pc.in
index d22b0cf4..275c77e1 100644
--- a/pangox.pc.in
+++ b/pangox.pc.in
@@ -7,6 +7,6 @@ Name: Pango X
Description: X Window System font support for Pango
Version: @VERSION@
Requires: pango
-Libs: -L${libdir} -lpangox @X_LIBS@ @X_EXTRA_LIBS@
+Libs: -L${libdir} -lpangox @PKGCONFIG_X_LIBS@
Cflags: -I${includedir}/pango-1.0 @X_CFLAGS@
diff --git a/pangoxft.pc.in b/pangoxft.pc.in
index 35460021..19cb0101 100644
--- a/pangoxft.pc.in
+++ b/pangoxft.pc.in
@@ -7,6 +7,6 @@ Name: Pango Xft
Description: Xft font support for Pango
Version: @VERSION@
Requires: pango
-Libs: -L${libdir} -lpangoxft @XFT_LIBS@
+Libs: -L${libdir} -lpangoxft @PKGCONFIG_XFT_LIBS@
Cflags: -I${includedir}/pango-1.0 @X_CFLAGS@ @FREETYPE_CFLAGS@
diff --git a/sanitize-la.sh b/sanitize-la.sh
new file mode 100755
index 00000000..9bc0ba2b
--- /dev/null
+++ b/sanitize-la.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+sed "s/dependency_libs=.*/dependency_libs=''/" < $1 > $1T && mv $1T $1
View Lorry Controller Status