diff options
| author | Brian Cameron <brian.cameron@sun.com> | 2007-10-15 22:50:57 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2007-10-15 22:50:57 +0000 |
| commit | 83981d623a26bd6ad8dc9e8c3cfd6a2b22fd6325 (patch) | |
| tree | f74f66f09229c1f7ebcd0c2a16ea10d9b2f31648 | |
| parent | 0e5a6d109485e7bb1f28ab8b4bf76d99ecc8cd38 (diff) | |
| download | gdm-83981d623a26bd6ad8dc9e8c3cfd6a2b22fd6325.tar.gz | |
Fix linking so that GDM builds on Solaris.
2007-10-15 Brian Cameron <brian.cameron@sun.com>
* configure.ac, gui/Makefile.am: Fix linking so that GDM builds on
Solaris.
svn path=/branches/gnome-2-18/; revision=5367
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.ac | 20 | ||||
| -rw-r--r-- | gui/Makefile.am | 16 |
3 files changed, 24 insertions, 17 deletions
@@ -1,3 +1,8 @@ +2007-10-15 Brian Cameron <brian.cameron@sun.com> + + * configure.ac, gui/Makefile.am: Fix linking so that GDM builds on + Solaris. + 2007-09-20 Brian Cameron <brian.cameron@sun.com> * configure.ac: Bump glib dependency to 2.12 since we now diff --git a/configure.ac b/configure.ac index 3f0ec3b6..0c35ca79 100644 --- a/configure.ac +++ b/configure.ac @@ -241,23 +241,19 @@ AM_GLIB_GNU_GETTEXT EXTRA_DAEMON_LIBS="" EXTRA_CHOOSER_LIBS="" -EXTRA_XNEST_LIBS="" -EXTRA_FLEXI_LIBS="" -EXTRA_DYNAMIC_LIBS="" -EXTRA_SETUP_LIBS="" +EXTRA_SOCKET_LIB="" +EXTRA_NSL_LIB="" AC_CHECK_FUNC(socket,,[ AC_CHECK_LIB(socket,socket, [ EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_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"])]) + EXTRA_SOCKET_LIB="-lsocket"])]) AC_CHECK_FUNC(gethostbyname,,[ AC_CHECK_LIB(nsl,gethostbyname, [ EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lnsl" - EXTRA_CHOOSER_LIBS="$EXTRA_CHOOSER_LIBS -lnsl"])]) + EXTRA_CHOOSER_LIBS="$EXTRA_CHOOSER_LIBS -lnsl" + EXTRA_NSL_LIB="-lnsl"])]) AC_CHECK_FUNC(sched_yield,[ AC_DEFINE(HAVE_SCHED_YIELD)],[ AC_CHECK_LIB(rt,sched_yield, [ @@ -817,10 +813,8 @@ AC_SUBST(DBUS_LIBS) # 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) +AC_SUBST(EXTRA_SOCKET_LIB) +AC_SUBST(EXTRA_NSL_LIB) # # Define some variables to represent the directories we use. diff --git a/gui/Makefile.am b/gui/Makefile.am index 17877922..c8e52a8f 100644 --- a/gui/Makefile.am +++ b/gui/Makefile.am @@ -100,6 +100,8 @@ gdmchooser_LDADD = \ $(PANGO_LIBS) \ $(GDK_LIBS) \ $(GDKPIXBUF_LIBS) \ + $(EXTRA_SOCKET_LIB) \ + $(EXTRA_NSL_LIB) \ $(top_builddir)/vicious-extensions/libviciousui.a \ $(X_EXTRA_LIBS) \ $(XINERAMA_LIBS) \ @@ -139,7 +141,8 @@ gdmsetup_LDADD = \ $(PANGO_LIBS) \ $(GDK_LIBS) \ $(GDKPIXBUF_LIBS) \ - $(EXTRA_SETUP_LIBS) \ + $(EXTRA_SOCKET_LIB) \ + $(EXTRA_NSL_LIB) \ $(LIBGNOMEUI_LIBS) \ $(top_builddir)/vicious-extensions/libviciousui.a \ $(X_LIBS) \ @@ -154,6 +157,8 @@ gdmphotosetup_LDADD = \ $(GOBJECT_LIBS) \ $(GDK_LIBS) \ $(GDKPIXBUF_LIBS) \ + $(EXTRA_SOCKET_LIB) \ + $(EXTRA_NSL_LIB) \ $(INTLLIBS) \ -lX11 \ $(top_builddir)/vicious-extensions/libviciousui.a @@ -166,7 +171,8 @@ gdmXnestchooser_LDADD = \ $(GOBJECT_LIBS) \ $(GDK_LIBS) \ $(top_builddir)/vicious-extensions/libviciousui.a \ - $(EXTRA_XNEST_LIBS) \ + $(EXTRA_SOCKET_LIB) \ + $(EXTRA_NSL_LIB) \ $(X_LIBS) \ -lXau \ -lX11 \ @@ -180,7 +186,8 @@ gdmflexiserver_LDADD = \ $(GOBJECT_LIBS) \ $(GDK_LIBS) \ $(top_builddir)/vicious-extensions/libviciousui.a \ - $(EXTRA_FLEXI_LIBS) \ + $(EXTRA_SOCKET_LIB) \ + $(EXTRA_NSL_LIB) \ $(X_LIBS) \ -lX11 \ -lXau \ @@ -194,7 +201,8 @@ gdmdynamic_LDADD = \ $(GOBJECT_LIBS) \ $(GDK_LIBS) \ $(top_builddir)/vicious-extensions/libviciousui.a \ - $(EXTRA_DYNAMIC_LIBS) \ + $(EXTRA_SOCKET_LIB) \ + $(EXTRA_NSL_LIB) \ $(X_LIBS) \ -lX11 \ -lXau |