diff options
| author | William Jon McCann <mccann@jhu.edu> | 2007-10-09 16:00:20 +0000 |
|---|---|---|
| committer | William Jon McCann <mccann@src.gnome.org> | 2007-10-09 16:00:20 +0000 |
| commit | 2c1dace2bd87d6bc915206bea426e408e2978936 (patch) | |
| tree | 49f2b5cc68382e20b7253291fde3f02a4b344327 /configure.ac | |
| parent | a63b3c6559063193c1fbeb443023178ba4e5dc41 (diff) | |
| download | gdm-2c1dace2bd87d6bc915206bea426e408e2978936.tar.gz | |
Some build fixes for Solaris. Patch from Brian Cameron
2007-10-09 William Jon McCann <mccann@jhu.edu>
* configure.ac:
* daemon/Makefile.am:
* daemon/main.c:
* gui/simple-greeter/gdm-user-manager.c:
Some build fixes for Solaris.
Patch from Brian Cameron <brian.cameron@sun.com>
svn path=/branches/mccann-gobject/; revision=5349
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index b5cbf437..a3e4ea65 100644 --- a/configure.ac +++ b/configure.ac @@ -509,14 +509,14 @@ if test x$with_xdmcp != xno ; then XDMCP_SUPPORT=yes],,[$X_LIBS -lX11 $X_EXTRA_LIBS]) ],,[#include <X11/Xproto.h>]) - if test x$with_xdmcp = xyes -a x$XDMCP_SUPPORT = x ; then + if test x$with_xdmcp = xyes -a "x$XDMCP_SUPPORT" = "x" ; then AC_MSG_ERROR(XDMCP support requested but XDMCP libraries not found) fi CPPFLAGS="$xdmcp_save_CPPFLAGS" fi AC_SUBST(XDMCP_LIBS) -if test x$XDMCP_SUPPORT = xyes ; then +if test "x$XDMCP_SUPPORT" = "xyes" ; then AM_CONDITIONAL(XDMCP_SUPPORT, true) GDMCHOOSER=gdmchooser else @@ -546,7 +546,7 @@ else LIBWRAP_PATH=/usr/sfw/lib/libwrap.so echo "Found $LIBWRAP_PATH" 1>&5 fi - EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -L/usr/sfw/lib -R/usr/sfw/lib -lwrap" + LIBWRAP_LIBS="-L/usr/sfw/lib -R/usr/sfw/lib -lwrap" ;; *) for I in $LDFLAGS $LIBS -L/usr/lib; do @@ -594,8 +594,8 @@ else *) if test -n "$LIBWRAP_PATH"; then AC_CHECK_LIB(wrap, hosts_ctl, [ - EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lwrap"], [ - EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS $LIBWRAP_PATH"]) + LIBWRAP_LIBS="-lwrap"], [ + LIBWRAP_LIBS="$LIBWRAP_PATH"]) fi dnl find out if we need -lnsl or whatever @@ -630,6 +630,7 @@ LIBS="$OLD_LIBS" esac fi +AC_SUBST(LIBWRAP_LIBS) dnl --------------------------------------------------------------------------- dnl - Check for Xinput |