diff options
| author | Kevin E Martin <kem@kem.org> | 2005-11-19 07:15:36 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2005-11-19 07:15:36 +0000 |
| commit | 7f31d566014d9e99569e0b93ee93009ec4028e6e (patch) | |
| tree | 681ed92889e5c64993e6ea8bc7b47bb6eb81b096 | |
| parent | 6ebcb3aab1c6a0c58b6d6d304d7ae61168990c33 (diff) | |
Update pkgconfig files to separate library build-time dependencies from
application build-time dependencies, and update package deps to work
with separate build roots.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.ac | 18 |
2 files changed, 14 insertions, 9 deletions
@@ -1,3 +1,8 @@ +2005-11-19 Kevin E. Martin <kem-at-freedesktop-dot-org> + + * configure.ac: + Update dependencies to work with separate build roots. + 2005-11-13 Alan Coopersmith <alan.coopersmith@sun.com> * configure.ac: diff --git a/configure.ac b/configure.ac index f6210d9..1e37378 100644 --- a/configure.ac +++ b/configure.ac @@ -204,7 +204,7 @@ PKG_CHECK_MODULES(XDM, xmu x11) PKG_CHECK_EXISTS(xinerama, [ AC_DEFINE([USE_XINERAMA], 1, [Define to 1 to use XINERAMA in greeter & chooser]) - PKG_CHECK_MODULES(XINERAMA, xinerama xineramaproto) + PKG_CHECK_MODULES(XINERAMA, xinerama) XDM_CFLAGS="$XDM_CFLAGS $XINERAMA_CFLAGS" XDM_LIBS="$XDM_LIBS $XINERAMA_LIBS" CHOOSER_CFLAGS="$CHOOSER_CFLAGS $XINERAMA_CFLAGS" @@ -252,7 +252,8 @@ AC_SUBST(XDM_PIXMAPDIR) XAW_CHECK_XPRINT_SUPPORT(XDM_PRINT) PKG_CHECK_MODULES(DMCP, xdmcp) -PKG_CHECK_MODULES(XPROTO, xproto) +PKG_CHECK_MODULES(XLIB, x11) +PKG_CHECK_MODULES(AUTH, xau) # # Greeter @@ -285,16 +286,16 @@ if test "x$DYNAMIC_GREETER" = "xyes" ; then # gcc should set these flags when -rdynamic is passed to it, other # compilers/linkers may need to be added if test "x$GCC" = "xyes"; then - XDM_LDFLAGS="$(XDM_LDFLAGS) -rdynamic" + XDM_LDFLAGS="$XDM_LDFLAGS -rdynamic" fi - PKG_CHECK_MODULES(XDMGREET, xt x11) + PKG_CHECK_MODULES(XDMGREET, xt x11 xext) GREETERLIB="${XDMLIBDIR}/libXdmGreet.so" AC_DEFINE_DIR(DEF_GREETER_LIB, GREETERLIB, [Location of Xdm Greeter library]) - XDMGREET_CFLAGS="$XDMGREET_CFLAGS $XDM_PRINT_CFLAGS $DMCP_CFLAGS $XPROTO_CFLAGS $OS_CFLAGS $GREETER_CFLAGS" + XDMGREET_CFLAGS="$XDMGREET_CFLAGS $XDM_PRINT_CFLAGS $DMCP_CFLAGS $XLIB_CFLAGS $OS_CFLAGS $GREETER_CFLAGS $AUTH_CFLAGS" XDMGREET_LIBS="$XDMGREET_LIBS $XDM_PRINT_LIBS $DMCP_LIBS $GREETER_LIBS" AC_SUBST(XDMGREET_CFLAGS) @@ -310,7 +311,7 @@ AM_CONDITIONAL(DYNAMIC_GREETER, test x$DYNAMIC_GREETER = xyes) # XDM # -XDM_CFLAGS="$XDM_CFLAGS $DMCP_CFLAGS $XPROTO_CFLAGS $OS_CFLAGS" +XDM_CFLAGS="$XDM_CFLAGS $DMCP_CFLAGS $XLIB_CFLAGS $OS_CFLAGS $AUTH_CFLAGS" XDM_LIBS="$XDM_LIBS $DMCP_LIBS" AC_CHECK_LIB(Xdmcp, XdmcpWrap, [xdmauth="yes"], [xdmauth="no"], [$DMCP_LIBS]) @@ -326,9 +327,8 @@ AC_SUBST(XDM_LDFLAGS) # xdmshell # -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_CFLAGS="$XDM_CFLAGS $XDM_PRINT_CFLAGS $AUTH_CFLAGS $DMCP_CFLAGS $XLIB_CFLAGS $XT_CFLAGS $OS_CFLAGS" XDMSHELL_LIBS="$XDM_LIBS $XDM_PRINT_LIBS $DMCP_LIBS" AC_SUBST(XDMSHELL_CFLAGS) @@ -338,7 +338,7 @@ AC_SUBST(XDMSHELL_LIBS) # Chooser # -CHOOSER_CFLAGS="-D_BSD_SOURCE $CHOOSER_CFLAGS $XDM_PRINT_CFLAGS $XPROTO_CFLAGS $DMCP_CFLAGS" +CHOOSER_CFLAGS="-D_BSD_SOURCE $CHOOSER_CFLAGS $XDM_PRINT_CFLAGS $XLIB_CFLAGS $DMCP_CFLAGS $AUTH_CFLAGS" CHOOSER_LIBS="$CHOOSER_LIBS $XDM_PRINT_LIBS $DMCP_LIBS" AC_SUBST(CHOOSER_CFLAGS) |