Upgrading to pkgconfig 0.17.2 broke the Solaris build because it no longer

2005-06-22  Brian Cameron  <brian.cameron@sun.com>

        * configure.in, vicious-extensions/Makefile.am,
          daemon/Makefile.am, gui/Makefile.am,
          gui/greeter/Makefile.am: Upgrading to
          pkgconfig 0.17.2 broke the Solaris build
          because it no longer allows the linker to
          pull in libraries that are implicitely
          included.  Now explicitely specify the
          dependant libraries and ensure they are
          included in the link statements for each
          binary.

5 files changed, 127 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 95ddac7b..4b582d2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2005-06-22  Brian Cameron  <brian.cameron@sun.com>
+
+	* configure.in, vicious-extensions/Makefile.am,
+	  daemon/Makefile.am, gui/Makefile.am, 
+	  gui/greeter/Makefile.am: Upgrading to 
+	  pkgconfig 0.17.2 broke the Solaris build 
+	  because it no longer allows the linker to
+	  pull in libraries that are implicitely
+	  included.  Now explicitely specify the
+	  dependant libraries and ensure they are
+	  included in the link statements for each
+	  binary.
+
 2005-06-20  Brian Cameron  <brian.cameron@sun.com>
 
 	* autogen.sh: Updated REQUIRED_AUTOMAKE_VERSION
diff --git a/configure.in b/configure.in
index 7ba97d50..63c987b2 100644
--- a/configure.in
+++ b/configure.in
@@ -7,8 +7,19 @@ AM_MAINTAINER_MODE
 
 AC_PROG_INTLTOOL([0.28])
 
+#GLIB
 GLIB_REQUIRED=2.6.0
+GOBJECT_REQUIRED=2.6.0
+
+#GTK
+GDK_REQUIRED=2.3.0
+GDKPIXBUF_REQUIRED=2.3.0
 GTK_REQUIRED=2.3.0
+
+#pango
+PANGO_REQUIRED=1.3.0
+PANGOFT_REQUIRED=1.3.0
+
 LIBGLADE_REQUIRED=1.99.2
 LIBGNOME_REQUIRED=1.96.0
 LIBGNOMEUI_REQUIRED=1.96.0
@@ -150,10 +161,41 @@ PKG_CHECK_MODULES(UTILS, gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI
 AC_SUBST(UTILS_CFLAGS)
 AC_SUBST(UTILS_LIBS)
 
+# glib
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
+PKG_CHECK_MODULES(GOBJECT, gobject-2.0 >= $GOBJECT_REQUIRED)
+AC_SUBST(GOBJECT_CFLAGS)
+AC_SUBST(GOBJECT_LIBS)
+
+# pango
+PKG_CHECK_MODULES(PANGO, pango >= $PANGO_REQUIRED)
+AC_SUBST(PANGO_CFLAGS)
+AC_SUBST(PANGO_LIBS)
+
+PKG_CHECK_MODULES(PANGOFT, pangoft2 >= $PANGO_REQUIRED)
+AC_SUBST(PANGOFT_CFLAGS)
+AC_SUBST(PANGOFT_LIBS)
+
+PKG_CHECK_MODULES(GDK, gdk-2.0 >= $GDK_REQUIRED)
+AC_SUBST(GDK_CFLAGS)
+AC_SUBST(GDK_LIBS)
+
+# GTK/libgnome*
+PKG_CHECK_MODULES(GDKPIXBUF, gdk-pixbuf-2.0 >= $GDKPIXBUF_REQUIRED)
+AC_SUBST(GDKPIXBUF_CFLAGS)
+AC_SUBST(GDKPIXBFU_LIBS)
+
+PKG_CHECK_MODULES(LIBGNOME, libgnome-2.0 >= $LIBGNOME_REQUIRED)
+AC_SUBST(LIBGNOME_CFLAGS)
+AC_SUBST(LIBGNOME_LIBS)
+
+PKG_CHECK_MODULES(LIBGNOMEUI, libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED)
+AC_SUBST(LIBGNOMEUI_CFLAGS)
+AC_SUBST(LIBGNOMEUI_LIBS)
+
 dnl Allow users to run gdmsetup using the console helper PAM stuff.
 if test "x$enable_console_helper" = "xyes"; then
   AM_CONDITIONAL(CONSOLE_HELPER, true)
@@ -172,11 +214,19 @@ AM_GLIB_GNU_GETTEXT
 
 EXTRA_DAEMON_LIBS=""
 EXTRA_CHOOSER_LIBS=""
+EXTRA_XNEST_LIBS=""
+EXTRA_FLEXI_LIBS=""
+EXTRA_DYNAMIC_LIBS=""
+EXTRA_SETUP_LIBS=""
 
 AC_CHECK_FUNC(socket,,[
 	      AC_CHECK_LIB(socket,socket, [
 			   EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lsocket"
-			   EXTRA_CHOOSER_LIBS="$EXTRA_CHOOSER_LIBS -lsocket"])])
+			   EXTRA_CHOOSER_LIBS="$EXTRA_CHOOSER_LIBS -lsocket"
+			   EXTRA_XNEST_LIBS="$EXTRA_XNEST_LIBS -lsocket"
+			   EXTRA_FLEXI_LIBS="$EXTRA_FLEXI_LIBS -lsocket"
+			   EXTRA_DYNAMIC_LIBS="$EXTRA_DYNAMIC_LIBS -lsocket"
+			   EXTRA_SETUP_LIBS="$EXTRA_SETUP_LIBS -lsocket"])])
 AC_CHECK_FUNC(gethostbyname,,[
 	      AC_CHECK_LIB(nsl,gethostbyname, [
 			   EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lnsl"
@@ -641,6 +691,10 @@ fi
 #
 AC_SUBST(EXTRA_DAEMON_LIBS)
 AC_SUBST(EXTRA_CHOOSER_LIBS)
+AC_SUBST(EXTRA_XNEST_LIBS)
+AC_SUBST(EXTRA_FLEXI_LIBS)
+AC_SUBST(EXTRA_DYNAMIC_LIBS)
+AC_SUBST(EXTRA_SETUP_LIBS)
 
 #
 # Configuration file foo, we need to get expanded versions of a bunch of things
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 5e02c6d2..f304aa69 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -73,6 +73,9 @@ gdm_binary_LDADD = \
 	-lpopt					\
 	$(XINERAMA_LIBS)			\
 	$(INTLLIBS)				\
+	$(GLIB_LIBS)				\
+	$(GOBJECT_LIBS)				\
+	$(GDK_LIBS)				\
 	-L$(top_builddir)/vicious-extensions	\
 	-lvicious
 
diff --git a/gui/Makefile.am b/gui/Makefile.am
index a00ae650..60463e74 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -104,8 +104,13 @@ gdmchooser_LDADD = \
 	-lpopt			\
 	-lX11			\
 	$(XINERAMA_LIBS)	\
-	$(X_EXTRA_LIBS)	\
+	$(X_EXTRA_LIBS)		\
 	$(INTLLIBS)		\
+	$(GLIB_LIBS)		\
+	$(GOBJECT_LIBS)		\
+	$(PANGO_LIBS)		\
+	$(GDK_LIBS)		\
+	$(GDKPIXBUF_LIBS)	\
 	-L$(top_builddir)/vicious-extensions	\
 	-lviciousui
 
@@ -118,6 +123,13 @@ gdmlogin_LDADD = \
 	$(XINERAMA_LIBS)	\
 	$(X_EXTRA_LIBS)		\
 	$(INTLLIBS)		\
+	$(GLIB_LIBS)		\
+	$(GOBJECT_LIBS)		\
+	$(GDK_LIBS)		\
+	$(PANGO_LIBS)		\
+	$(GDKPIXBUF_LIBS)	\
+	$(LIBGNOME_LIBS)	\
+	$(LIBGNOMEUI_LIBS)	\
 	-L$(top_builddir)/vicious-extensions	\
 	-lviciousui-minimal
 
@@ -127,12 +139,27 @@ gdmsetup_LDADD = \
 	-lXau			\
 	-lX11			\
 	$(INTLLIBS)		\
+	$(GLIB_LIBS)		\
+	$(GOBJECT_LIBS)		\
+	$(PANGO_LIBS)		\
+	$(GDK_LIBS)		\
+	$(GDKPIXBUF_LIBS)	\
+	$(LIBGNOME_LIBS)	\
+	$(LIBGNOMEUI_LIBS)	\
+	$(EXTRA_SETUP_LIBS)	\
 	-L$(top_builddir)/vicious-extensions	\
 	-lviciousui-gnome
 
 gdmphotosetup_LDADD = \
 	$(GUI_LIBS)		\
 	$(INTLLIBS)		\
+	$(GLIB_LIBS)		\
+	$(GOBJECT_LIBS)		\
+	$(GDK_LIBS)		\
+	$(GDKPIXBUF_LIBS)	\
+	$(LIBGNOME_LIBS)	\
+	$(LIBGNOMEUI_LIBS)	\
+	$(INTLLIBS)		\
 	-L$(top_builddir)/vicious-extensions	\
 	-lviciousui-gnome
 
@@ -141,6 +168,12 @@ gdmXnestchooser_LDADD = \
 	-lXau			\
 	-lX11			\
 	$(INTLLIBS)		\
+	$(GLIB_LIBS)		\
+	$(GOBJECT_LIBS)		\
+	$(GDK_LIBS)		\
+	$(LIBGNOME_LIBS)	\
+	$(LIBGNOMEUI_LIBS)	\
+	$(EXTRA_XNEST_LIBS)	\
 	-L$(top_builddir)/vicious-extensions	\
 	-lviciousui-gnome
 
@@ -148,13 +181,25 @@ gdmflexiserver_LDADD = \
 	$(GUI_LIBS)		\
 	-lXau			\
 	$(INTLLIBS)		\
+	$(GLIB_LIBS)		\
+	$(GOBJECT_LIBS)		\
+	$(GDK_LIBS)		\
+	$(LIBGNOME_LIBS)	\
+	$(LIBGNOMEUI_LIBS)	\
+	$(EXTRA_FLEXI_LIBS)	\
 	-L$(top_builddir)/vicious-extensions	\
 	-lviciousui-gnome
 
-gdmdynamic_LDADD = \
-	$(GUI_LIBS) \
-	-lXau \
-	$(INTLLIBS) \
+gdmdynamic_LDADD = 		\
+	$(GUI_LIBS)		\
+	-lXau			\
+	$(INTLLIBS) 		\
+	$(GLIB_LIBS) 		\
+	$(GOBJECT_LIBS) 	\
+	$(GDK_LIBS) 		\
+	$(LIBGNOME_LIBS) 	\
+	$(LIBGNOMEUI_LIBS)	\
+	$(EXTRA_DYNAMIC_LIBS)	\
 	-L$(top_builddir)/vicious-extensions \
 	-lviciousui-gnome
 
diff --git a/gui/greeter/Makefile.am b/gui/greeter/Makefile.am
index 1d41a787..4a9290f8 100644
--- a/gui/greeter/Makefile.am
+++ b/gui/greeter/Makefile.am
@@ -71,6 +71,12 @@ gdmgreeter_LDADD = \
 	-lX11			\
 	$(XINERAMA_LIBS)	\
 	$(X_EXTRA_LIBS)		\
+	$(GLIB_LIBS)		\
+	$(GOBJECT_LIBS)		\
+	$(PANGO_LIBS)		\
+	$(PANGOFT_LIBS)		\
+	$(GDK_LIBS)		\
+	$(GDKPIXBUF_LIBS)	\
 	$(GREETER_LIBS)
 
 EXTRA_DIST = \