diff options
author | Kevin E Martin <kem@kem.org> | 2005-11-01 15:05:18 +0000 |
---|---|---|
committer | Kevin E Martin <kem@kem.org> | 2005-11-01 15:05:18 +0000 |
commit | dc12a42ebd70b24c4d84632fa253cd6e3094cbd2 (patch) | |
tree | 2a9fb1c0f794beaeb47ca0869c7d8930245370e5 /configure.ac | |
parent | 2b9da10c25ddcc9f098fa9af69e5f560037b5660 (diff) |
Update pkgcheck depedencies to work with separate build roots.
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 16 |
1 files changed, 14 insertions, 2 deletions
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) |