Commit 2c1dace2 authored by William Jon McCann's avatar William Jon McCann Committed by William Jon McCann

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
parent a63b3c65
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>
2007-10-05 William Jon McCann <mccann@jhu.edu>
* MAINTAINERS:
......
......@@ -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
......
......@@ -111,6 +111,7 @@ gdm_simple_slave_LDFLAGS = \
gdm_simple_slave_LDADD = \
$(DAEMON_LIBS) \
$(EXTRA_DAEMON_LIBS) \
$(top_builddir)/common/libgdmcommon.la \
$(NULL)
......@@ -165,6 +166,7 @@ gdm_product_slave_LDFLAGS = \
gdm_product_slave_LDADD = \
$(DAEMON_LIBS) \
$(EXTRA_DAEMON_LIBS) \
$(top_builddir)/common/libgdmcommon.la \
$(NULL)
......@@ -240,6 +242,8 @@ gdm_binary_LDFLAGS = \
gdm_binary_LDADD = \
$(DAEMON_LIBS) \
$(XDMCP_LIBS) \
$(LIBWRAP_LIBS) \
$(top_builddir)/common/libgdmcommon.la \
$(NULL)
......
......@@ -31,6 +31,7 @@
#include <pwd.h>
#include <grp.h>
#include <wait.h>
#include <locale.h>
#include <glib.h>
#include <glib/gi18n.h>
......
......@@ -45,7 +45,13 @@
#define DEFAULT_ALLOW_ROOT TRUE
#define DEFAULT_MAX_ICON_SIZE 128
#define DEFAULT_USER_MAX_FILE 65536
#ifdef __sun
#define DEFAULT_MINIMAL_UID 100
#else
#define DEFAULT_MINIMAL_UID 500
#endif
#define DEFAULT_GLOBAL_FACE_DIR DATADIR "/faces"
#define DEFAULT_USER_ICON "stock_person"
#define DEFAULT_EXCLUDE { "bin", \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment