From c9365a74f10f85f091f8041dba4615303de77d9e Mon Sep 17 00:00:00 2001 From: herd Date: Sun, 8 May 2011 11:03:45 +0000 Subject: [PATCH] libx11 dso for 4.6 on fedora --- config.h.in | 6 ++++++ configure.ac | 5 ++++- configure.ac.in | 3 +++ panel-plugin/Makefile.am | 2 ++ panel-plugin/Makefile.in | 11 ++++++++++- redhat/Makefile.in | 9 ++++++++- 6 files changed, 33 insertions(+), 3 deletions(-) diff --git a/config.h.in b/config.h.in index ce13e72..886b299 100644 --- a/config.h.in +++ b/config.h.in @@ -66,6 +66,9 @@ /* Define if your file defines LC_MESSAGES. */ #undef HAVE_LC_MESSAGES +/* Define if libX11 is available */ +#undef HAVE_LIBX11 + /* Define to 1 if you have the header file. */ #undef HAVE_LOCALE_H @@ -146,6 +149,9 @@ /* Version number of package */ #undef VERSION +/* Define to 1 if the X Window System is missing or not being used. */ +#undef X_DISPLAY_MISSING + /* Define to 1 if on MINIX. */ #undef _MINIX diff --git a/configure.ac b/configure.ac index 84f1d2c..8860131 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ dnl m4_define([squeeze_version_major], [0]) m4_define([squeeze_version_minor], [1]) m4_define([squeeze_version_micro], [2]) -m4_define([squeeze_version_build], [r00203]) +m4_define([squeeze_version_build], [r00212]) m4_define([squeeze_version_tag], []) m4_define([squeeze_vers], [squeeze_version_major().squeeze_version_minor().squeeze_version_micro()]) m4_define([squeeze_version], [squeeze_version_major().squeeze_version_minor().squeeze_version_micro()ifelse(squeeze_version_tag(), [svn], [squeeze_version_tag()-squeeze_version_build()], [squeeze_version_tag()])]) @@ -39,6 +39,9 @@ LT_INIT dnl Check for standard header files AC_HEADER_STDC +dnl Check for X11 installed +XDT_CHECK_LIBX11_REQUIRE() + dnl configure the panel plugin XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.99]) diff --git a/configure.ac.in b/configure.ac.in index 8fcf05e..f0dbee7 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -34,6 +34,9 @@ LT_INIT dnl Check for standard header files AC_HEADER_STDC +dnl Check for X11 installed +XDT_CHECK_LIBX11_REQUIRE() + dnl configure the panel plugin XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.3.99]) diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am index 39d0175..35efc66 100644 --- a/panel-plugin/Makefile.am +++ b/panel-plugin/Makefile.am @@ -3,6 +3,7 @@ plugin_PROGRAMS = xfce4-squeezebox-plugin xfce4_squeezebox_plugin_CFLAGS = -Wall -DDATA_DIR=\"$(datadir)/xfce4/xfce4-squeezebox-plugin\" \ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" @LIBXFCE4PANEL_CFLAGS@ \ + $(LIBX11_CFLAGS) \ @EXO_CFLAGS@ @LIBWNCK_CFLAGS@ $(PATH_DEFINES) \ -DG_LOG_DOMAIN=\"SBP\" \ @LIBGIO_CFLAGS@ @ID3TAG_CFLAGS@ @LIBXFCONF_CFLAGS@ \ @@ -12,6 +13,7 @@ xfce4_squeezebox_plugin_CFLAGS = -Wall -DDATA_DIR=\"$(datadir)/xfce4/xfce4-squee # -Wl -rdynamic xfce4_squeezebox_plugin_LDFLAGS = @LIBXFCE4PANEL_LIBS@ @LIBXFCONF_LIBS@ \ + $(LIBX11_LIBS) \ @EXO_LIBS@ @LIBWNCK_LIBS@ @LIBGIO_LIBS@ @ID3TAG_LIBS@ @LIBGTHREAD_LIBS@ \ -Wl -rdynamic diff --git a/panel-plugin/Makefile.in b/panel-plugin/Makefile.in index 8a9a9e9..3147efc 100644 --- a/panel-plugin/Makefile.in +++ b/panel-plugin/Makefile.in @@ -193,6 +193,9 @@ LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ LIBWNCK_LIBS = @LIBWNCK_LIBS@ LIBWNCK_REQUIRED_VERSION = @LIBWNCK_REQUIRED_VERSION@ LIBWNCK_VERSION = @LIBWNCK_VERSION@ +LIBX11_CFLAGS = @LIBX11_CFLAGS@ +LIBX11_LDFLAGS = @LIBX11_LDFLAGS@ +LIBX11_LIBS = @LIBX11_LIBS@ LIBXFCE4PANEL_CFLAGS = @LIBXFCE4PANEL_CFLAGS@ LIBXFCE4PANEL_LIBS = @LIBXFCE4PANEL_LIBS@ LIBXFCE4PANEL_REQUIRED_VERSION = @LIBXFCE4PANEL_REQUIRED_VERSION@ @@ -249,6 +252,11 @@ VERMINOR = @VERMINOR@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XGETTEXT_ARGS = @XGETTEXT_ARGS@ +XMKMF = @XMKMF@ +X_CFLAGS = @X_CFLAGS@ +X_EXTRA_LIBS = @X_EXTRA_LIBS@ +X_LIBS = @X_LIBS@ +X_PRE_LIBS = @X_PRE_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -285,7 +293,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@ @@ -305,6 +312,7 @@ top_srcdir = @top_srcdir@ plugindir = $(libexecdir)/xfce4/panel-plugins xfce4_squeezebox_plugin_CFLAGS = -Wall -DDATA_DIR=\"$(datadir)/xfce4/xfce4-squeezebox-plugin\" \ -DPACKAGE_LOCALE_DIR=\"$(localedir)\" @LIBXFCE4PANEL_CFLAGS@ \ + $(LIBX11_CFLAGS) \ @EXO_CFLAGS@ @LIBWNCK_CFLAGS@ $(PATH_DEFINES) \ -DG_LOG_DOMAIN=\"SBP\" \ @LIBGIO_CFLAGS@ @ID3TAG_CFLAGS@ @LIBXFCONF_CFLAGS@ \ @@ -314,6 +322,7 @@ xfce4_squeezebox_plugin_CFLAGS = -Wall -DDATA_DIR=\"$(datadir)/xfce4/xfce4-squee #todo: use --dynamic-list=someFile instead of -Wl -rdynamic # -Wl -rdynamic xfce4_squeezebox_plugin_LDFLAGS = @LIBXFCE4PANEL_LIBS@ @LIBXFCONF_LIBS@ \ + $(LIBX11_LIBS) \ @EXO_LIBS@ @LIBWNCK_LIBS@ @LIBGIO_LIBS@ @ID3TAG_LIBS@ @LIBGTHREAD_LIBS@ \ -Wl -rdynamic diff --git a/redhat/Makefile.in b/redhat/Makefile.in index cb81d9b..61f7e21 100644 --- a/redhat/Makefile.in +++ b/redhat/Makefile.in @@ -133,6 +133,9 @@ LIBWNCK_CFLAGS = @LIBWNCK_CFLAGS@ LIBWNCK_LIBS = @LIBWNCK_LIBS@ LIBWNCK_REQUIRED_VERSION = @LIBWNCK_REQUIRED_VERSION@ LIBWNCK_VERSION = @LIBWNCK_VERSION@ +LIBX11_CFLAGS = @LIBX11_CFLAGS@ +LIBX11_LDFLAGS = @LIBX11_LDFLAGS@ +LIBX11_LIBS = @LIBX11_LIBS@ LIBXFCE4PANEL_CFLAGS = @LIBXFCE4PANEL_CFLAGS@ LIBXFCE4PANEL_LIBS = @LIBXFCE4PANEL_LIBS@ LIBXFCE4PANEL_REQUIRED_VERSION = @LIBXFCE4PANEL_REQUIRED_VERSION@ @@ -189,6 +192,11 @@ VERMINOR = @VERMINOR@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XGETTEXT_ARGS = @XGETTEXT_ARGS@ +XMKMF = @XMKMF@ +X_CFLAGS = @X_CFLAGS@ +X_EXTRA_LIBS = @X_EXTRA_LIBS@ +X_LIBS = @X_LIBS@ +X_PRE_LIBS = @X_PRE_LIBS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -225,7 +233,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ mandir = @mandir@ mkdir_p = @mkdir_p@ oldincludedir = @oldincludedir@