summarylogtreecommitdiffstats
path: root/bbkeys.patch
blob: fe0b895f63dddcd09ee72f9b48c281ec3bb7ac57 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
diff -up src/bbkeys-0.9.1/configure.ac.orig src/bbkeys-0.9.1/configure.ac
--- src/bbkeys-0.9.1/configure.ac.orig	2008-12-21 20:05:55.000000000 -0700
+++ src/bbkeys-0.9.1/configure.ac	2013-09-02 11:00:54.000000000 -0600
@@ -1,6 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(src/main.cpp)
-AM_INIT_AUTOMAKE(bbkeys, 0.9.1)
+AC_INIT(bbkeys, 0.9.1)
+AC_CONFIG_SRCDIR(src/main.cpp)
+AM_INIT_AUTOMAKE
 AM_MAINTAINER_MODE
 AC_PREFIX_DEFAULT(/usr/local)
 
@@ -129,13 +130,16 @@ dnl Checks for Xextension
 AC_CHECK_LIB(Xext, XMissingExtension, LIBS="$LIBS -lXext",
              AC_MSG_ERROR(XMissingExtension not found in -lXext))
 
+m4_include([/usr/share/aclocal/pkg.m4])
+
 dnl pkgconfig checks for blackbox library
 PKG_CHECK_MODULES(LIBBT, libbt)
-CXXFLAGS="$CXXFLAGS $LIBBT_CFLAGS"
-LIBS="$LIBS $LIBBT_LIBS"
+PKG_CHECK_MODULES(XFT, xft)
+CXXFLAGS="$CXXFLAGS $LIBBT_CFLAGS $XFT_CFLAGS"
+LIBS="$LIBS $LIBBT_LIBS $XFT_LIBS"
 
 dnl generate the config header
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
 
 dnl Output files
 AC_OUTPUT( \