diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 16 |
3 files changed, 22 insertions, 3 deletions
@@ -1,3 +1,9 @@ +2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org> + + * Makefile.am: + * configure.ac: + Update pkgcheck depedencies to work with separate build roots. + 2005-10-28 Alan Coopersmith <alan.coopersmith@sun.com> * configure.ac: diff --git a/Makefile.am b/Makefile.am index 7dc4558..9dd4a18 100644 --- a/Makefile.am +++ b/Makefile.am @@ -116,7 +116,8 @@ CPP_FILES_FLAGS = $(MANDEFS) $(EXTRAMANDEFS) # # xdmshell # -xdmshell_CFLAGS = $(XPROTO_CFLAGS) -DBINDIR="\"$(bindir)\"" +xdmshell_CFLAGS = $(XDMSHELL_CFLAGS) -DBINDIR="\"$(bindir)\"" + xdmshell_SOURCES = \ xdmshell.c diff --git a/configure.ac b/configure.ac index 6f5ee3b..81fcf51 100644 --- a/configure.ac +++ b/configure.ac @@ -197,7 +197,7 @@ AC_SUBST(SERVERSTYPE) PKG_CHECK_EXISTS(xinerama, [ AC_DEFINE([USE_XINERAMA], 1, [Define to 1 to use XINERAMA in greeter & chooser]) - PKG_CHECK_MODULES(XINERAMA, xinerama) + PKG_CHECK_MODULES(XINERAMA, xinerama xineramaproto) XDM_CFLAGS="$XDM_CFLAGS $XINERAMA_CFLAGS" XDM_LIBS="$XDM_LIBS $XINERAMA_LIBS" CHOOSER_CFLAGS="$CHOOSER_CFLAGS $XINERAMA_CFLAGS" @@ -262,6 +262,18 @@ AC_SUBST(XDM_CFLAGS) AC_SUBST(XDM_LIBS) # +# xmdshell +# + +PKG_CHECK_MODULES(AUTH, xau) +PKG_CHECK_MODULES(XT, xt) +XDMSHELL_CFLAGS="$XDM_CFLAGS $XDM_PRINT_CFLAGS $AUTH_CFLAGS $DMCP_CFLAGS $XPROTO_CFLAGS $XT_CFLAGS $OS_CFLAGS" +XDMSHELL_LIBS="$XDM_LIBS $XDM_PRINT_LIBS $DMCP_LIBS" + +AC_SUBST(XDMSHELL_CFLAGS) +AC_SUBST(XDMSHELL_LIBS) + +# # Greeter # @@ -280,7 +292,7 @@ AC_SUBST(XDMGREET_LIBS) # Chooser # -CHOOSER_CFLAGS="-D_BSD_SOURCE $XDM_PRINT_CFLAGS $XPROTO_CFLAGS" +CHOOSER_CFLAGS="-D_BSD_SOURCE $CHOOSER_CFLAGS $XDM_PRINT_CFLAGS $XPROTO_CFLAGS $DMCP_CFLAGS" CHOOSER_LIBS="$CHOOSER_LIBS $XDM_PRINT_LIBS $DMCP_LIBS" AC_SUBST(CHOOSER_CFLAGS) |