diff options
| author | Eric Anholt <anholt@freebsd.org> | 2005-11-21 07:21:39 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2005-11-21 07:21:39 +0000 |
| commit | d0149420c83f80cb15151a361b0929d53505d056 (patch) | |
| tree | 8daff5893109007b0619a9e0e70803f06bdf0f73 | |
| parent | b4ee0e22b54786e0bb9a5b1c527be2e7f71100ba (diff) | |
Bug #5113: The insertion of -lutil into XDM_LIBS ended up having no effect
because PKG_CHECK_MODULES(XDM, ...) later overwrote it. So put
-lutil into XDM_OS_LIBS and add XDM_OS_LIBS to XDM_LIBS later.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,10 @@ +2005-11-20 Eric Anholt <anholt@FreeBSD.org> + + * configure.ac: + Bug #5113: The insertion of -lutil into XDM_LIBS ended up having no + effect because PKG_CHECK_MODULES(XDM, ...) later overwrote it. So put + -lutil into XDM_OS_LIBS and add XDM_OS_LIBS to XDM_LIBS later. + 2005-11-19 Alan Coopersmith <alan.coopersmith@sun.com> * configure.ac: diff --git a/configure.ac b/configure.ac index 78ed97e..9a3bd23 100644 --- a/configure.ac +++ b/configure.ac @@ -53,7 +53,7 @@ AC_CHECK_FUNC(getspnam, AC_DEFINE(USESHADOW,1, # According to the old Imakefile, FreeBSD has this in libutil AC_CHECK_FUNC(setproctitle, [HAS_SETPROCTITLE="yes"], AC_CHECK_LIB(util, setproctitle, - [HAS_SETPROCTITLE="yes" ; XDM_LIBS="$XDM_LIBS -lutil"])) + [HAS_SETPROCTITLE="yes" ; XDM_OS_LIBS="$XDM_OS_LIBS -lutil"])) if test "x$HAS_SETPROCTITLE" = "xyes" ; then AC_DEFINE(HAS_SETPROCTITLE,1, [Define to 1 if you have the 'setproctitle' function.]) @@ -62,7 +62,7 @@ fi # According to the old Imakefile, BSD/OS has this in libutil AC_CHECK_FUNC(setusercontext, [HAS_SETUSERCONTEXT="yes"], AC_CHECK_LIB(util, setusercontext, - [HAS_SETUSERCONTEXT="yes" ; XDM_LIBS="$XDM_LIBS -lutil"])) + [HAS_SETUSERCONTEXT="yes" ; XDM_OS_LIBS="$XDM_OS_LIBS -lutil"])) if test "x$HAS_SETUSERCONTEXT" = "xyes" ; then AC_DEFINE(HAS_SETUSERCONTEXT,1, [Define to 1 if you have the 'setusercontext' function.]) @@ -201,6 +201,8 @@ AC_SUBST(SHELL_CMD) PKG_CHECK_MODULES(XDM, xmu x11 xau) +XDM_LIBS="$XDM_LIBS $XDM_OS_LIBS" + PKG_CHECK_EXISTS(xinerama, [ AC_DEFINE([USE_XINERAMA], 1, [Define to 1 to use XINERAMA in greeter & chooser]) |