summaryrefslogtreecommitdiff
path: root/packages/efl/e/fix-configure.patch
blob: 9b328de16c1f6a3e8bbe47155092cffb47016a83 (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
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48

#
# Patch managed by http://www.holgerschurig.de/patcher.html
#

--- e/configure.in~fix-configure.patch
+++ e/configure.in
@@ -114,9 +114,7 @@
 AC_PATH_XTRA
 AC_CHECK_HEADER(X11/X.h,
   [
-    x_dir=${x_dir:-/usr/X11R6}
-    x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
-    x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
+    x_libs="-lX11 -lXext";
   ],[
     AC_MSG_ERROR([Cannot find X headers and libraries.])
   ]
--- e/src/bin/Makefile.am~fix-configure.patch
+++ e/src/bin/Makefile.am
@@ -1,6 +1,5 @@
 MAINTAINERCLEANFILES = Makefile.in
-INCLUDES = -I$(includedir) \
-	   -I$(top_srcdir) \
+INCLUDES = -I$(top_srcdir) \
 	   -I$(top_srcdir)/src/bin \
 	   -I$(top_srcdir)/src/lib \
 	   @e_cflags@ \
--- e/src/lib/Makefile.am~fix-configure.patch
+++ e/src/lib/Makefile.am
@@ -1,6 +1,5 @@
 MAINTAINERCLEANFILES	= Makefile.in
-INCLUDES		= -I$(includedir) \
-			  -I$(top_srcdir)/src/bin \
+INCLUDES		= -I$(top_srcdir)/src/bin \
 			  @ecore_cflags@ \
 			  @evas_cflags@
 
--- e/src/preload/Makefile.am~fix-configure.patch
+++ e/src/preload/Makefile.am
@@ -2,7 +2,6 @@
 
 INCLUDES               = -I. \
                          -I$(top_srcdir) \
-			 -I$(includedir) \
                          -I$(top_srcdir)src/preload \
                          @x_cflags@
 pkgdir                 = $(libdir)/enlightenment/preload