[PATCH] Only link Xorg with libconfig.la

Sun May 16 18:44:29 PDT 2010

On Sun, May 16, 2010 at 09:29:02PM +0200, Julien Cristau wrote:
> Other DDXs don't use input hotplugging since config_init was moved to
> the DDX in commit d33adcdf03c69407d151e732fa0cf9947151eb19, so there's
> no need to link this in.
> 
> Signed-off-by: Julien Cristau <jcristau at debian.org>
> ---
>  configure.ac                  |   15 +++++++--------
>  hw/xfree86/common/Makefile.am |    1 +
>  2 files changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index cf2a358..1c7875e 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -869,7 +869,6 @@ if test "x$CONFIG_NEED_DBUS" = xyes; then
>          AC_DEFINE(CONFIG_NEED_DBUS, 1, [Use D-Bus for input hotplug])
>  fi
>  AM_CONDITIONAL(CONFIG_NEED_DBUS, [test "x$CONFIG_NEED_DBUS" = xyes])
> -CONFIG_LIB='$(top_builddir)/config/libconfig.la'
>  
>  if test "x$USE_SIGIO_BY_DEFAULT" = xyes; then
>  	USE_SIGIO_BY_DEFAULT_VALUE=TRUE
> @@ -1454,7 +1453,7 @@ PKG_CHECK_MODULES([XSERVERLIBS], [$REQUIRED_LIBS])
>  # require.
>  #
>  XSERVER_CFLAGS="${XSERVER_CFLAGS} ${XSERVERCFLAGS_CFLAGS}"
> -XSERVER_LIBS="$DIX_LIB $CONFIG_LIB $MI_LIB $OS_LIB"
> +XSERVER_LIBS="$DIX_LIB $MI_LIB $OS_LIB"
>  XSERVER_SYS_LIBS="${XSERVERLIBS_LIBS} ${SYS_LIBS} ${LIBS}"
>  AC_SUBST([XSERVER_LIBS])
>  AC_SUBST([XSERVER_SYS_LIBS])
> @@ -1492,7 +1491,7 @@ AC_MSG_RESULT([$XVFB])
>  AM_CONDITIONAL(XVFB, [test "x$XVFB" = xyes])
>  
>  if test "x$XVFB" = xyes; then
> -	XVFB_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB"
> +	XVFB_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB"
>  	XVFB_SYS_LIBS="$XVFBMODULES_LIBS $GLX_SYS_LIBS"
>  	AC_SUBST([XVFB_LIBS])
>  	AC_SUBST([XVFB_SYS_LIBS])
> @@ -1513,7 +1512,7 @@ if test "x$XNEST" = xyes; then
>  	if test "x$have_xnest" = xno; then
>  		AC_MSG_ERROR([Xnest build explicitly requested, but required modules not found.])
>  	fi
> -	XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DIX_LIB $MAIN_LIB $OS_LIB $CONFIG_LIB"
> +	XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DIX_LIB $MAIN_LIB $OS_LIB"
>  	XNEST_SYS_LIBS="$XNESTMODULES_LIBS $GLX_SYS_LIBS"
>  	AC_SUBST([XNEST_LIBS])
>  	AC_SUBST([XNEST_SYS_LIBS])
> @@ -1876,7 +1875,7 @@ if test "x$XWIN" = xyes; then
>  			XWIN_SYS_LIBS=-lwinsock2
>  			;;
>  	esac
> -	XWIN_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $RANDR_LIB $RENDER_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $OS_LIB"
> +	XWIN_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $RANDR_LIB $RENDER_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $OS_LIB"
>  	XWIN_SYS_LIBS="$XWIN_SYS_LIBS $XWINMODULES_LIBS"
>  	AC_SUBST(XWIN_LIBS)
>  	AC_SUBST(XWIN_SERVER_NAME)
> @@ -1906,7 +1905,7 @@ if test "x$XQUARTZ" = xyes; then
>  	AC_DEFINE(XQUARTZ,1,[Have Quartz])
>  	AC_DEFINE(ROOTLESS,1,[Build Rootless code])
>  
> -	DARWIN_LIBS="$MI_LIB $OS_LIB $DIX_LIB $MAIN_LIB $FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB"
> +	DARWIN_LIBS="$MI_LIB $OS_LIB $DIX_LIB $MAIN_LIB $FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $XPSTUBS_LIB"
>  	AC_SUBST([DARWIN_LIBS])
>  
>  	AC_CHECK_LIB([Xplugin],[xp_init],[:])
> @@ -1967,7 +1966,7 @@ if test "x$DMX" = xyes; then
>  	fi
>  	DMX_INCLUDES="$XEXT_INC $RENDER_INC $RECORD_INC"
>  	XDMX_CFLAGS="$DMXMODULES_CFLAGS"
> -	XDMX_LIBS="$FB_LIB $MI_LIB $RENDER_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_SHADOW_LIB $MIEXT_DAMAGE_LIB $XEXT_LIB $MAIN_LIB $DIX_LIB $CONFIG_LIB $OS_LIB $FIXES_LIB"
> +	XDMX_LIBS="$FB_LIB $MI_LIB $RENDER_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_SHADOW_LIB $MIEXT_DAMAGE_LIB $XEXT_LIB $MAIN_LIB $DIX_LIB $OS_LIB $FIXES_LIB"
>  	XDMX_SYS_LIBS="$DMXMODULES_LIBS"
>  	AC_SUBST([XDMX_CFLAGS])
>  	AC_SUBST([XDMX_LIBS])
> @@ -2101,7 +2100,7 @@ if test "$KDRIVE" = yes; then
>  	    ;;
>      esac
>      KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.la'
> -    KDRIVE_LOCAL_LIBS="$MAIN_LIB $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB $CONFIG_LIB"
> +    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_LIBS="$TSLIB_LIBS $KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS"
> diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am
> index ad27210..821a2b5 100644
> --- a/hw/xfree86/common/Makefile.am
> +++ b/hw/xfree86/common/Makefile.am
> @@ -41,6 +41,7 @@ libcommon_la_SOURCES = xf86Configure.c xf86ShowOpts.c xf86Bus.c xf86Config.c \
>                        xf86Mode.c xorgHelper.c \
>                        $(XVSOURCES) $(BUSSOURCES) $(RANDRSOURCES)
>  nodist_libcommon_la_SOURCES = xf86DefModeSet.c xf86Build.h
> +libcommon_la_LIBADD = $(top_builddir)/config/libconfig.la
>  
>  INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
>  	   -I$(srcdir)/../loader -I$(srcdir)/../parser \
> -- 
> 1.7.1
> 

Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>

Cheers,
  Peter