diff options
| author | George Lebl <jirka@5z.com> | 2003-07-15 18:12:57 +0000 |
|---|---|---|
| committer | George Lebl <jirka@src.gnome.org> | 2003-07-15 18:12:57 +0000 |
| commit | 6ca44ecc8e6be7ef91386da3abd52d366ed9ffaa (patch) | |
| tree | ec805e4f4573b79b8138b3503483d45b57101f6d | |
| parent | bac29b1c270adaed8b3fba2f7f074ce01276a564 (diff) | |
| download | gdm-6ca44ecc8e6be7ef91386da3abd52d366ed9ffaa.tar.gz | |
check for needing to link in libsocket and libnsl
Tue Jul 15 11:08:31 2003 George Lebl <jirka@5z.com>
* configure.in: check for needing to link in libsocket and libnsl
Also forgot to checkin the ChangeLog for last commit:
Tue Jul 15 11:07:57 2003 George Lebl <jirka@5z.com>
* configure.in, gui/Makefile.am, gdmchooser.(c|glade): Whack
GnomeIconList and replace with GtkTreeView as in the other
browsers. Fixes among other things connecting to the wrong
host (Why someone has NOT seen this bug before is a mystery
to me, but the chooser was definately not usable for more
then a few hosts and then only if they responded in
alphabetical order). Thanks to Niall Power for spotting this
bug. Also clean up the glade file a bit and don't compile
with libgnome/ui anymore.
* gui/gdmlogin.c, gui/gdmsetup.c,
gui/greeter/greeter_action_language.c,
gui/greeter/greeter_canvas_item.c: Add the rules hint for
lists since it looks cooler and seems easier to browse to me.
* NEWS: update
| -rw-r--r-- | ChangeLog | 23 | ||||
| -rw-r--r-- | configure.in | 13 |
2 files changed, 34 insertions, 2 deletions
@@ -1,3 +1,26 @@ +Tue Jul 15 11:08:31 2003 George Lebl <jirka@5z.com> + + * configure.in: check for needing to link in libsocket and libnsl + +Tue Jul 15 11:07:57 2003 George Lebl <jirka@5z.com> + + * configure.in, gui/Makefile.am, gdmchooser.(c|glade): Whack + GnomeIconList and replace with GtkTreeView as in the other + browsers. Fixes among other things connecting to the wrong + host (Why someone has NOT seen this bug before is a mystery + to me, but the chooser was definately not usable for more + then a few hosts and then only if they responded in + alphabetical order). Thanks to Niall Power for spotting this + bug. Also clean up the glade file a bit and don't compile + with libgnome/ui anymore. + + * gui/gdmlogin.c, gui/gdmsetup.c, + gui/greeter/greeter_action_language.c, + gui/greeter/greeter_canvas_item.c: Add the rules hint for + lists since it looks cooler and seems easier to browse to me. + + * NEWS: update + Mon Jul 14 16:44:19 2003 George Lebl <jirka@5z.com> * daemon/misc.[ch], daemon/slave.c: Fix #97774 by resetting the diff --git a/configure.in b/configure.in index 151fde5f..2c8f9e64 100644 --- a/configure.in +++ b/configure.in @@ -168,6 +168,14 @@ ALL_LINGUAS="am ar az be bg bn ca cs cy da de el es et eu fa fi fr ga gl hi he h AM_GLIB_GNU_GETTEXT EXTRA_DAEMON_LIBS="" +EXTRA_CHOOSER_LIBS="" + +AC_CHECK_FUNC(socket,,[AC_CHECK_LIB(socket,socket, [ + EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lsocket" + EXTRA_CHOOSER_LIBS="$EXTRA_CHOOSER_LIBS -lsocket"])]) +AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname, [ + EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lnsl" + EXTRA_CHOOSER_LIBS="$EXTRA_CHOOSER_LIBS -lnsl"])]) # TCP Wrappers for XDMCP access control if test x$with_tcp_wrappers = xno ; then @@ -218,9 +226,9 @@ else dnl find out if we need -lnsl or whatever LIB_NSL= if test -n "$LIBWRAP_PATH"; then - AC_MSG_CHECKING(whether -lwrap requires -lnsl) + AC_MSG_CHECKING(whether -lwrap also requires -lnsl) ORIG_LIBS="$LIBS" - LIBS="-lwrap $LIBS" + LIBS="$EXTRA_DAEMON_LIBS $LIBS" AC_TRY_LINK([ #include <tcpd.h> int allow_severity, deny_severity; @@ -425,6 +433,7 @@ CPPFLAGS="$xinerama_save_cppflags" # Subst the extra libs # AC_SUBST(EXTRA_DAEMON_LIBS) +AC_SUBST(EXTRA_CHOOSER_LIBS) # # Configuration file foo, we need to get expanded versions of a bunch of things |