e/imlib2: better support for building without X

Support not only building imlib2 itself without X, but also programs
that link against imlib2 by patching the Imlib2.h header as necessary.

6 files changed, 34 insertions, 1 deletions

diff --git a/e/imlib2/BUILD b/e/imlib2/BUILD
index 7b82be6ea5..b3b9881b01 100755
--- a/e/imlib2/BUILD
+++ b/e/imlib2/BUILD
@@ -1,5 +1,7 @@
 if [[ $HOST == x86_64-* ]]; then
-  OPTS="--disable-mmx $OPTS"
+  OPTS="--disable-mmx $IMLIB2_X11 $OPTS"
+else
+  OPTS="$IMLIB2_X11 $OPTS"
 fi &&
 
 default_build
diff --git a/e/imlib2/CONFIGURE b/e/imlib2/CONFIGURE
new file mode 100755
index 0000000000..a770cab7ca
--- /dev/null
+++ b/e/imlib2/CONFIGURE
@@ -0,0 +1 @@
+config_query_option IMLIB2_X11 "Enable X11 support?" y "" "--without-x"
diff --git a/e/imlib2/DEPENDS b/e/imlib2/DEPENDS
index 4991b369e2..9e8de0c5a0 100755
--- a/e/imlib2/DEPENDS
+++ b/e/imlib2/DEPENDS
@@ -8,6 +8,10 @@ if [[ $IMLIB2_CVS == y ]]; then
   depends automake-1.9
 fi &&
 
+if [[ -z $IMLIB2_X11 ]]; then
+  depends xorg-libs
+fi &&
+
 optional_depends 'tiff'              \
                  '--with-tiff'       \
                  '--without-tiff'    \
diff --git a/e/imlib2/HISTORY b/e/imlib2/HISTORY
index 73d51e1955..1f0ff5df5a 100644
--- a/e/imlib2/HISTORY
+++ b/e/imlib2/HISTORY
@@ -1,3 +1,12 @@
+2009-5-21 Justin Boffemmyer <flux@sourcemage.org>
+	* CONFIGURE: new, ask if X support is wanted
+	* BUILD: add IMLIB2_X11 to OPTS
+	* DEPENDS: test IMLIB2_X11 and depends xorg-libs if building with X
+	  support
+	* PRE_BUILD: patch Imlib2.h if building without X support
+	* Imlib2.h.patch: new, patch to remove all X11 defines for building
+	  without X support
+
 2008-10-23 Vlad Glagolev <stealth@sourcemage.org>
 	* DETAILS: updated spell to 1.4.2; quoting paths; cleaned up;
 	  SECURITY_PATCH+=1 (http://secunia.com/Advisories/32354/);
diff --git a/e/imlib2/Imlib2.h.patch b/e/imlib2/Imlib2.h.patch
new file mode 100644
index 0000000000..5b3c122555
--- /dev/null
+++ b/e/imlib2/Imlib2.h.patch
@@ -0,0 +1,13 @@
+--- src/lib/Imlib2.h	2008-08-17 05:39:12.000000000 -0400
++++ src/lib/Imlib2.h	2009-05-22 00:00:30.000000000 -0400
+@@ -22,10 +22,6 @@
+ #  endif
+ # endif
+ 
+-# ifndef X_DISPLAY_MISSING
+-#  include <X11/Xlib.h>
+-# endif
+-
+ /* Data types to use */
+ # ifndef DATA64
+ #  define DATA64 unsigned long long
diff --git a/e/imlib2/PRE_BUILD b/e/imlib2/PRE_BUILD
index e2c00f43c4..e859dc1e53 100755
--- a/e/imlib2/PRE_BUILD
+++ b/e/imlib2/PRE_BUILD
@@ -7,3 +7,7 @@ if [[ $IMLIB2_CVS == y ]]; then
   sed -i "s/; automake/; automake-1.9/" autogen.sh &&
   NOCONFIGURE=ON ./autogen.sh
 fi
+
+if [[ $IMLIB2_X11 == "--without-x" ]]; then
+  patch -p0 < "$SCRIPT_DIRECTORY"/Imlib2.h.patch
+fi