]> pilppa.org Git - familiar-h63xx-build.git/blob - org.handhelds.familiar/packages/xkbd/xkbd-0.8.15/libtool-lossage.patch
OE tree imported from monotone branch org.openembedded.oz354fam083 at revision 8b12e3...
[familiar-h63xx-build.git] / org.handhelds.familiar / packages / xkbd / xkbd-0.8.15 / libtool-lossage.patch
1 --- clean/xkbd-0.8.12/configure.ac      2003-06-03 17:27:20.000000000 +0100
2 +++ xkbd-0.8.12/configure.ac    2004-03-28 19:35:33.000000000 +0100
3 @@ -46,11 +46,11 @@
4        CFLAGS="$CFLAGS -g -DDEBUG"
5    fi])
6  
7 +PKG_CHECK_MODULES(XTEST, xtst xext)
8  
9  # Checks for programs.
10  AC_PROG_CC
11  AC_PROG_INSTALL
12 -AC_PROG_LIBTOOL
13  
14  # Checks for libraries.
15  
16 @@ -70,6 +70,8 @@
17  
18  AC_SUBST(XFT_LIBS)
19  AC_SUBST(XPM_LIBS)
20 +AC_SUBST(XTEST_LIBS)
21 +AC_SUBST(XTEST_CFLAGS)
22  
23  AC_OUTPUT(Makefile 
24            src/Makefile
25 @@ -78,4 +80,4 @@
26            data/img/Makefile
27            packaging/Makefile
28            packaging/ipkg/Makefile
29 -          packaging/ipkg/control )
30 \ No newline at end of file
31 +          packaging/ipkg/control )
32 --- clean/xkbd-0.8.12/src/Makefile.am   2003-06-03 17:31:07.000000000 +0100
33 +++ xkbd-0.8.12/src/Makefile.am 2004-03-28 19:34:39.000000000 +0100
34 @@ -1,7 +1,7 @@
35  DEFAULT_CONFIG=$(pkgdatadir)/en_GB.qwerty.xkbd
36  
37 -LDADD = @X_LIBS@ -lX11 -lXtst $(XPM_LIBS) $(XFT_LIBS)
38 -CFLAGS = @CFLAGS@ -DDEFAULTCONFIG=\"$(DEFAULT_CONFIG)\"
39 +LDADD = @XTEST_LIBS@ $(XPM_LIBS) $(XFT_LIBS)
40 +AM_CFLAGS = @XTEST_CFLAGS@ @CFLAGS@ -DDEFAULTCONFIG=\"$(DEFAULT_CONFIG)\"
41  
42  bin_PROGRAMS = xkbd
43  xkbd_SOURCES = xkbd.c libXkbd.c box.c button.c kb.c libvirtkeys.c \