From b71cb5326a1cdacb7347e8f8c31bd20ac30c4f0d Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
Date: Sun, 11 Jun 2006 10:23:49 +0000
Subject: [PATCH] 1. autofoot patches. 2. fix maximize to work again. :)

SVN revision: 23375
---
 legacy/ecore/configure.in        | 10 +++-------
 legacy/ecore/ecore-config.in     |  4 ++--
 legacy/edje/configure.in         | 12 ++++--------
 legacy/edje/edje-config.in       |  6 +++---
 legacy/eet/eet-config.in         |  4 ++--
 legacy/embryo/configure.in       | 10 +++-------
 legacy/embryo/embryo-config.in   |  4 ++--
 legacy/emotion/configure.in      | 12 ++++--------
 legacy/emotion/emotion-config.in |  4 ++--
 legacy/evas/configure.in         | 10 +++-------
 legacy/evas/evas-config.in       |  4 ++--
 11 files changed, 30 insertions(+), 50 deletions(-)

diff --git a/legacy/ecore/configure.in b/legacy/ecore/configure.in
index ec87198ded..3f2751af0e 100644
--- a/legacy/ecore/configure.in
+++ b/legacy/ecore/configure.in
@@ -52,14 +52,10 @@ fi
 
 							
 dnl Set PACKAGE_DATA_DIR in config.h.
-if test "x${datadir}" = 'x${prefix}/share'; then
-  if test "x${prefix}" = "xNONE"; then
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", [Shared Data Directory])
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared Data Directory])
-  fi
+if test "x${prefix}" = "xNONE"; then
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", [Shared Data Directory])
 else
-  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}", [Shared Data Directory])
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared Data Directory])
 fi
 
 dnl Set PACKAGE_BIN_DIR in config.h.
diff --git a/legacy/ecore/ecore-config.in b/legacy/ecore/ecore-config.in
index 453efed0c3..92a2e14c4c 100644
--- a/legacy/ecore/ecore-config.in
+++ b/legacy/ecore/ecore-config.in
@@ -42,8 +42,8 @@ while test $# -gt 0; do
       echo @VERSION@
       ;;
     --cflags)
-      if test @includedir@ != /usr/include ; then
-        includes="-I@includedir@"
+      if test @prefix@/local != /usr/include ; then
+        includes="-I@prefix@/local"
       fi
       echo $includes @EVAS_CFLAGS@
       ;;
diff --git a/legacy/edje/configure.in b/legacy/edje/configure.in
index fe0e59cb6f..a1dcaf2775 100644
--- a/legacy/edje/configure.in
+++ b/legacy/edje/configure.in
@@ -65,16 +65,12 @@ if test "x${libdir}" = 'x${exec_prefix}/lib'; then
     fi
   fi
 fi
-
+							
 dnl Set PACKAGE_DATA_DIR in config.h.
-if test "x${datadir}" = 'x${prefix}/share'; then
-  if test "x${prefix}" = "xNONE"; then
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", [Shared data directory])
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared data directory])
-  fi
+if test "x${prefix}" = "xNONE"; then
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", [Shared Data Directory])
 else
-  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}", [Shared data directory])
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared Data Directory])
 fi
 
 dnl Set PACKAGE_BIN_DIR in config.h.
diff --git a/legacy/edje/edje-config.in b/legacy/edje/edje-config.in
index 759c2b6fe6..a84a66c91e 100644
--- a/legacy/edje/edje-config.in
+++ b/legacy/edje/edje-config.in
@@ -39,8 +39,8 @@ while test $# -gt 0; do
       echo @VERSION@
       ;;
     --cflags)
-      if test @includedir@ != /usr/include ; then
-        includes=-I@includedir@
+      if test @prefix@/local != /usr/include ; then
+        includes="-I@prefix@/local"
       fi
       echo $includes @EVAS_CFLAGS@
       ;;
@@ -49,7 +49,7 @@ while test $# -gt 0; do
       echo $libdirs -ledje
       ;;
     --datadir)
-      echo @datadir@/edje
+      echo @prefix@/share/edje
       ;;
     *)
       echo "${usage}" 1>&2
diff --git a/legacy/eet/eet-config.in b/legacy/eet/eet-config.in
index cac167d55d..2061bd938f 100644
--- a/legacy/eet/eet-config.in
+++ b/legacy/eet/eet-config.in
@@ -39,8 +39,8 @@ while test $# -gt 0; do
       echo @VERSION@
       ;;
     --cflags)
-      if test @includedir@ != /usr/include ; then
-        includes=-I@includedir@
+      if test @prefix@/local != /usr/include ; then
+        includes="-I@prefix@/local"
       fi
       echo $includes
       ;;
diff --git a/legacy/embryo/configure.in b/legacy/embryo/configure.in
index 2ad4dda999..d89d5adf6e 100644
--- a/legacy/embryo/configure.in
+++ b/legacy/embryo/configure.in
@@ -66,14 +66,10 @@ if test "x${libdir}" = 'x${exec_prefix}/lib'; then
 fi
 
 dnl Set PACKAGE_DATA_DIR in config.h.
-if test "x${datadir}" = 'x${prefix}/share'; then
-  if test "x${prefix}" = "xNONE"; then
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", [Shared Data Directory] )
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared Data Directory])
-  fi
+if test "x${prefix}" = "xNONE"; then
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", [Shared Data Directory])
 else
-  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}", [Shared Data Directory])
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared Data Directory])
 fi
 
 dnl Set PACKAGE_BIN_DIR in config.h.
diff --git a/legacy/embryo/embryo-config.in b/legacy/embryo/embryo-config.in
index 0cb4e231b4..4e2880b975 100644
--- a/legacy/embryo/embryo-config.in
+++ b/legacy/embryo/embryo-config.in
@@ -39,8 +39,8 @@ while test $# -gt 0; do
       echo @VERSION@
       ;;
     --cflags)
-      if test @includedir@ != /usr/include ; then
-        includes=-I@includedir@
+      if test @prefix@/local != /usr/include ; then
+        includes="-I@prefix@/local"
       fi
       echo $includes
       ;;
diff --git a/legacy/emotion/configure.in b/legacy/emotion/configure.in
index ebc97472e7..e982d22121 100644
--- a/legacy/emotion/configure.in
+++ b/legacy/emotion/configure.in
@@ -47,16 +47,12 @@ if test "x${libdir}" = 'x${exec_prefix}/lib'; then
     fi
   fi
 fi
-
+							
 dnl Set PACKAGE_DATA_DIR in config.h.
-if test "x${datadir}" = 'x${prefix}/share'; then
-  if test "x${prefix}" = "xNONE"; then
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", [Package Data Directory])
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Package Data Directory])
-  fi
+if test "x${prefix}" = "xNONE"; then
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", [Shared Data Directory])
 else
-  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}", [Package Data Directory])
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared Data Directory])
 fi
 
 dnl Set PACKAGE_BIN_DIR in config.h.
diff --git a/legacy/emotion/emotion-config.in b/legacy/emotion/emotion-config.in
index 503445e9ae..4777ba067c 100644
--- a/legacy/emotion/emotion-config.in
+++ b/legacy/emotion/emotion-config.in
@@ -39,8 +39,8 @@ while test $# -gt 0; do
       echo @VERSION@
       ;;
     --cflags)
-      if test @includedir@ != /usr/include ; then
-        includes=-I@includedir@
+      if test @prefix@/local != /usr/include ; then
+        includes="-I@prefix@/local"
       fi
       echo $includes @EVAS_CFLAGS@
       ;;
diff --git a/legacy/evas/configure.in b/legacy/evas/configure.in
index eb591c8851..c0071b6a7c 100644
--- a/legacy/evas/configure.in
+++ b/legacy/evas/configure.in
@@ -56,14 +56,10 @@ if test "x${libdir}" = 'x${exec_prefix}/lib'; then
 fi
 
 dnl Set PACKAGE_DATA_DIR in config.h.
-if test "x${datadir}" = 'x${prefix}/share'; then
-  if test "x${prefix}" = "xNONE"; then
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", [Shared Data Directory])
-  else
-    AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared Data Directory])
-  fi
+if test "x${prefix}" = "xNONE"; then
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", [Shared Data Directory])
 else
-  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}", [Shared Data Directory])
+  AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared Data Directory])
 fi
 
 dnl Set PACKAGE_BIN_DIR in config.h.
diff --git a/legacy/evas/evas-config.in b/legacy/evas/evas-config.in
index 3e27268944..b5c7b7ec00 100644
--- a/legacy/evas/evas-config.in
+++ b/legacy/evas/evas-config.in
@@ -39,8 +39,8 @@ while test $# -gt 0; do
       echo @VERSION@
       ;;
     --cflags)
-      if test @includedir@ != /usr/include ; then
-        includes=-I@includedir@
+      if test @prefix@/local != /usr/include ; then
+        includes="-I@prefix@/local"
       fi
       echo $includes
       ;;