Remove some old build cruft

4 files changed, 13 insertions, 58 deletions

diff --git a/configure.ac b/configure.ac
index 5cb6e582..5570e5e2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -415,6 +415,15 @@ if $have_cairo ; then
 
   LIBS=$pango_save_libs
   LDFLAGS=$pango_save_ldflags
+
+  PKGCONFIG_CAIRO_REQUIRES=
+  if $have_cairo_freetype;  then
+    PKGCONFIG_CAIRO_REQUIRES="$PKGCONFIG_CAIRO_REQUIRES pangoft2"
+  fi
+  if $have_cairo_win32;  then
+    PKGCONFIG_CAIRO_REQUIRES="$PKGCONFIG_CAIRO_REQUIRES pangowin32"
+  fi
+  AC_SUBST(PKGCONFIG_CAIRO_REQUIRES)
 fi
 
 AM_CONDITIONAL(HAVE_CAIRO, $have_cairo)
@@ -549,54 +558,6 @@ AC_ARG_ENABLE(installed_tests,
 AM_CONDITIONAL(BUILDOPT_INSTALL_TESTS, test x$enable_installed_tests = xyes)
 
 
-dnl ******************************************************
-dnl * See whether to include shared library dependencies *
-dnl ******************************************************
-
-AC_ARG_ENABLE(explicit-deps, 
-              AC_HELP_STRING([--enable-explicit-deps=@<:@no/auto/yes@:>@],
-                             [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)
-    export SED
-    deplibs_check_method=`(./libtool --config; echo 'eval echo \"$deplibs_check_method\"') | sh`
-    if test "x$deplibs_check_method" '!=' xpass_all || 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)
-
-PKGCONFIG_MATH_LIBS=
-PKGCONFIG_CAIRO_REQUIRES=
-
-if test $enable_explicit_deps = yes ; then
-  PKGCONFIG_MATH_LIBS=-lm
-
-  X_LIBS="$X_LIBS $X_EXTRA_LIBS"
-
-  if $have_cairo_freetype;  then
-    PKGCONFIG_CAIRO_REQUIRES="$PKGCONFIG_CAIRO_REQUIRES pangoft2"
-  fi
-  if $have_cairo_win32;  then
-    PKGCONFIG_CAIRO_REQUIRES="$PKGCONFIG_CAIRO_REQUIRES pangowin32"
-  fi
-fi
-
-AC_SUBST(PKGCONFIG_MATH_LIBS)
-AC_SUBST(PKGCONFIG_CAIRO_REQUIRES)
-AM_CONDITIONAL(DISABLE_EXPLICIT_DEPS, test $enable_explicit_deps = no)
-
 AC_HEADER_DIRENT
 AC_CHECK_HEADERS(unistd.h)
 
diff --git a/pango.pc.in b/pango.pc.in
index b181e486..bae2fd33 100644
--- a/pango.pc.in
+++ b/pango.pc.in
@@ -7,5 +7,6 @@ Name: Pango
 Description: Internationalized text handling
 Version: @VERSION@
 Requires: glib-2.0 gobject-2.0
-Libs: -L${libdir} -lpango-@PANGO_API_VERSION@ @PKGCONFIG_MATH_LIBS@
+Libs: -L${libdir} -lpango-@PANGO_API_VERSION@
+Libs.private: -lm
 Cflags: -I${includedir}/pango-1.0
diff --git a/pango/Makefile.am b/pango/Makefile.am
index 56b9f7b0..a61ae4cd 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -244,7 +244,6 @@ libpangoxft_1_0_la_LIBADD =			\
 	libpangoft2-$(PANGO_API_VERSION).la	\
 	libpango-$(PANGO_API_VERSION).la	\
 	$(GLIB_LIBS)				\
-	$(X_LIBS)				\
 	$(XFT_LIBS)				\
 	$(FREETYPE_LIBS)			\
 	$(libm)
@@ -499,13 +498,6 @@ dist-hook: \
 	$(top_builddir)/build/win32/vs9/pangocairo.vcproj	\
 	$(top_builddir)/build/win32/vs9/pango.headers
 
-install-exec-hook:
-if DISABLE_EXPLICIT_DEPS
-	-for i in libpangoft2-$(PANGO_API_VERSION).la libpangoxft-$(PANGO_API_VERSION).la libpangowin32-$(PANGO_API_VERSION).la; do \
-	  test -f $(DESTDIR)$(libdir)/$$i && $(SHELL) $(top_srcdir)/sanitize-la.sh $(DESTDIR)$(libdir)/$$i ; \
-	done
-endif
-
 TESTS = check.defs
 
 -include $(top_srcdir)/git.mk
diff --git a/pangocairo.pc.in b/pangocairo.pc.in
index 9f18defd..223f8396 100644
--- a/pangocairo.pc.in
+++ b/pangocairo.pc.in
@@ -6,6 +6,7 @@ includedir=@includedir@
 Name: Pango Cairo
 Description: Cairo rendering support for Pango
 Version: @VERSION@
-Requires: pango cairo @PKGCONFIG_CAIRO_REQUIRES@
+Requires: pango cairo
+Requires.private: @PKGCONFIG_CAIRO_REQUIRES@
 Libs: -L${libdir} -lpangocairo-@PANGO_API_VERSION@
 Cflags: -I${includedir}/pango-1.0