[patch] fixing as-needed issues

blackbox-0.70.1-as-needed.patch (text/plain), 1.57 KB, created by Kacper Kowalik (Xarthisius) (RETIRED) on 2010-01-08 14:48:03 UTC

--- blackbox-0.70.1.orig/src/Makefile.am	2005-01-10 15:05:16.000000000 +0100
+++ blackbox-0.70.1/src/Makefile.am	2010-01-08 15:11:14.841574354 +0100
@@ -22,7 +22,7 @@
 
 DEFAULT_MENU		= $(pkgdatadir)/menu
 DEFAULT_STYLE		= $(pkgdatadir)/styles/Gray
-CPPFLAGS		= @CPPFLAGS@ @SHAPE@ @XFT@ @DEBUG@ @NLS@ \
+AM_CPPFLAGS		= @SHAPE@ @XFT@ @DEBUG@ @NLS@ \
 			  -DLOCALEPATH=\"$(pkgdatadir)/nls\" \
 			  -DDEFAULTMENU=\"$(DEFAULT_MENU)\" \
 			  -DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \
--- blackbox-0.70.1.orig/lib/Makefile.am	2005-03-31 17:32:16.000000000 +0200
+++ blackbox-0.70.1/lib/Makefile.am	2010-01-08 15:15:41.411319768 +0100
@@ -62,7 +62,8 @@
 			Util.hh						\
 			XDG.hh
 
-libbt_la_LIBADD =	@ICONV@ @LOCALE@
+libbt_la_LIBADD =	@ICONV@ @LOCALE@ @xft_LIBS@
+libbt_la_CFLAGS = 	@xft_CFLAGS@
 
 pkgconfigdir = 		$(libdir)/pkgconfig
 nodist_pkgconfig_DATA =	libbt.pc
--- blackbox-0.70.1.orig/util/Makefile.am	2005-01-03 10:42:57.000000000 +0100
+++ blackbox-0.70.1/util/Makefile.am	2010-01-08 15:10:59.331323597 +0100
@@ -21,7 +21,7 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
 # DEALINGS IN THE SOFTWARE.
 
-CPPFLAGS		= @CPPFLAGS@ @DEBUG@ @NLS@ \
+AM_CPPFLAGS		= @DEBUG@ @NLS@ \
 			  -I$(top_srcdir)/lib
 
 bin_SCRIPTS		= bsetbg
--- blackbox-0.70.1.orig/configure.ac	2005-11-03 09:21:59.000000000 +0100
+++ blackbox-0.70.1/configure.ac	2010-01-08 15:37:35.485323866 +0100
@@ -29,7 +29,8 @@
 AC_PROG_INSTALL
 
 dnl libbt shouldn't be shared by default (yet)
-AC_DISABLE_SHARED
+dnl ... let's give it a try ...
+dnl AC_DISABLE_SHARED
 AC_PROG_LIBTOOL
 AC_SUBST(LIBTOOL_DEPS)