[PATCH v2] Fix Xdmx and Xephyr build when DTrace support is enabled

[Alan Coopersmith]

Nicolas Peninguy wrote:
> This fixes the following build errors when DTrace is enabled
> (--with-dtrace):
> 
>   CCLD   Xdmx
> /usr/bin/ld: ../../os/os.O: undefined reference to symbol 'dladdr@@GLIBC_2.2.5'
> /usr/bin/ld: note: 'dladdr@@GLIBC_2.2.5' is defined in DSO /lib64/libdl.so.2 so try adding it to the linker command line
> 
>   CCLD   Xephyr
> ../../../os/os.O: In function `TimerForce':
> /home/nico/work/xserver/os/WaitFor.c:481: multiple definition of `TimerForce'
> ../../../os/os.O:/home/nico/work/xserver/os/WaitFor.c:481: first defined here
> 
> Signed-off-by: Nicolas Peninguy <nico at lostgeeks.org>
> ---
>  configure.ac |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index bd027cd..4b1e686 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1335,7 +1335,7 @@ AC_DEFINE(BIGREQS, 1, [Support BigRequests extension])
>  
>  if test "x$SPECIAL_DTRACE_OBJECTS" = "xyes" ; then
>    DIX_LIB='$(top_builddir)/dix/dix.O'
> -  OS_LIB='$(top_builddir)/os/os.O $(SHA1_LIBS)'
> +  OS_LIB='$(top_builddir)/os/os.O $(SHA1_LIBS) $(DLOPEN_LIBS)'
>  else
>    DIX_LIB='$(top_builddir)/dix/libdix.la'
>    OS_LIB='$(top_builddir)/os/libos.la'
> @@ -2122,7 +2122,7 @@ if test "$KDRIVE" = yes; then
>      KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.la'
>      KDRIVE_LOCAL_LIBS="$MAIN_LIB $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB"
>      KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS"
> -    KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $OS_LIB"
> +    KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB"
>      KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS $TSLIB_LIBS"
>  
>      AC_SUBST([XEPHYR_LIBS])

$(DLOPEN_LIBS) is empty on Solaris, since dlopen() is in libc, so I never
noticed that.   Seems fine to me.   (Is this a sign of work to make the
dtrace probes usuable with SystemTap on Linux?  If so, cool!)

Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>

-- 
	-Alan Coopersmith-        alan.coopersmith at oracle.com
	 Oracle Solaris Platform Engineering: X Window System