]> pilppa.org Git - familiar-h63xx-build.git/blob - org.handhelds.familiar/packages/e17/e-wm/fix-configure.patch
OE tree imported from monotone branch org.openembedded.oz354fam083 at revision 8b12e3...
[familiar-h63xx-build.git] / org.handhelds.familiar / packages / e17 / e-wm / fix-configure.patch
1 diff -Nur e~/configure.in e/configure.in
2 --- e~/configure.in     2005-09-29 13:17:29.000000000 -0700
3 +++ e/configure.in      2005-09-29 13:19:35.000000000 -0700
4 @@ -114,9 +114,7 @@
5  AC_PATH_XTRA
6  AC_CHECK_HEADER(X11/X.h,
7    [
8 -    x_dir=${x_dir:-/usr/X11R6}
9 -    x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
10 -    x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
11 +    x_libs="-lX11 -lXext";
12    ],[
13      AC_MSG_ERROR([Cannot find X headers and libraries.])
14    ]
15 diff -Nur e~/src/bin/Makefile.am e/src/bin/Makefile.am
16 --- e~/src/bin/Makefile.am      2005-09-29 13:17:29.000000000 -0700
17 +++ e/src/bin/Makefile.am       2005-09-29 13:19:35.000000000 -0700
18 @@ -1,6 +1,5 @@
19  MAINTAINERCLEANFILES = Makefile.in
20 -INCLUDES = -I$(includedir) \
21 -          -I$(top_srcdir) \
22 +INCLUDES = -I$(top_srcdir) \
23            -I$(top_srcdir)/src/bin \
24            -I$(top_srcdir)/src/lib \
25            @e_cflags@ \
26 diff -Nur e~/src/lib/Makefile.am e/src/lib/Makefile.am
27 --- e~/src/lib/Makefile.am      2005-09-29 13:17:29.000000000 -0700
28 +++ e/src/lib/Makefile.am       2005-09-29 13:19:56.000000000 -0700
29 @@ -1,6 +1,5 @@
30  MAINTAINERCLEANFILES   = Makefile.in
31 -INCLUDES               = -I$(includedir) \
32 -                         -I$(top_srcdir)/src/bin \
33 +INCLUDES               = -I$(top_srcdir)/src/bin \
34                           @e_cflags@
35  
36  lib_LTLIBRARIES                = libe.la
37 diff -Nur e~/src/preload/Makefile.am e/src/preload/Makefile.am
38 --- e~/src/preload/Makefile.am  2005-09-29 13:17:29.000000000 -0700
39 +++ e/src/preload/Makefile.am   2005-09-29 13:19:35.000000000 -0700
40 @@ -2,7 +2,6 @@
41  
42  INCLUDES               = -I. \
43                           -I$(top_srcdir) \
44 -                        -I$(includedir) \
45                           -I$(top_srcdir)src/preload \
46                           @x_cflags@
47  pkgdir                 = $(libdir)/enlightenment/preload