diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | tests/Makefile.am | 1 |
3 files changed, 15 insertions, 2 deletions
@@ -1,3 +1,11 @@ +2007-12-21 Brian Cameron <brian.cameron@sun.com> + + * configure.ac, tests/Makefile.am: Minor change to + add -lsocket and -lnsl when building the test programs + on Solaris. This is needed to link getnameinfo, + getaddrinfo, freeaddrinfo, and gai_strerror which + are references from libgdmcommon. + 2007-12-21 William Jon McCann <mccann@jhu.edu> * daemon/gdm-session-direct.c: diff --git a/configure.ac b/configure.ac index 8847e471..d18bc85f 100644 --- a/configure.ac +++ b/configure.ac @@ -251,6 +251,7 @@ EXTRA_XNEST_LIBS="" EXTRA_FLEXI_LIBS="" EXTRA_DYNAMIC_LIBS="" EXTRA_SETUP_LIBS="" +EXTRA_TEST_LIBS="" EXTRA_GREETER_LIBS="" AC_CHECK_FUNC(socket,,[ @@ -261,12 +262,14 @@ AC_CHECK_FUNC(socket,,[ 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_SETUP_LIBS="$EXTRA_SETUP_LIBS -lsocket" + EXTRA_TEST_LIBS="$EXTRA_TEST_LIBS -lsocket"])]) AC_CHECK_FUNC(gethostbyname,,[ AC_CHECK_LIB(nsl,gethostbyname, [ EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lnsl" EXTRA_SLAVE_LIBS="$EXTRA_SLAVE_LIBS -lnsl" - EXTRA_CHOOSER_LIBS="$EXTRA_CHOOSER_LIBS -lnsl"])]) + EXTRA_CHOOSER_LIBS="$EXTRA_CHOOSER_LIBS -lnsl" + EXTRA_TEST_LIBS="$EXTRA_TEST_LIBS -lnsl"])]) AC_CHECK_FUNC(sched_yield,[ AC_DEFINE(HAVE_SCHED_YIELD)],[ AC_CHECK_LIB(rt,sched_yield, [ @@ -1031,6 +1034,7 @@ AC_SUBST(EXTRA_XNEST_LIBS) AC_SUBST(EXTRA_FLEXI_LIBS) AC_SUBST(EXTRA_DYNAMIC_LIBS) AC_SUBST(EXTRA_SETUP_LIBS) +AC_SUBST(EXTRA_TEST_LIBS) AC_SUBST(EXTRA_GREETER_LIBS) dnl --------------------------------------------------------------------------- diff --git a/tests/Makefile.am b/tests/Makefile.am index 998c57f4..6f6ee2e4 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -33,6 +33,7 @@ m_common_CFLAGS = \ m_common_LDADD = \ @CHECK_LIBS@ \ $(COMMON_LIBS) \ + $(EXTRA_TEST_LIBS) \ $(top_builddir)/common/libgdmcommon.la \ $(NULL) |