Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl
Modified Files:
configure.ac configure.in
Log Message:
An attempt to find evas engine headers in places not included by default.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/configure.ac,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- configure.ac 4 Nov 2003 07:16:44 -0000 1.17
+++ configure.ac 14 Nov 2003 06:07:06 -0000 1.18
@@ -54,18 +54,6 @@
fi
changequote([,])dnl
-AC_ARG_WITH(edje,
- [ --with-edje=DIR use edje in <DIR>],
- [CFLAGS="$CFLAGS -I$withval/include"
- LIBS="-L$withval/lib $LIBS"])
-
-AC_PATH_GENERIC(edje,, [
- AC_SUBST(edje_libs)
- AC_SUBST(edje_cflags)],
- AC_MSG_ERROR(Cannot find edje: Is edje-config in path?))
-edje_libs=`edje-config --libs`
-edje_cflags=`edje-config --cflags`
-
AC_ARG_WITH(edb,
[ --with-edb=DIR use edb in <DIR>],
[CFLAGS="$CFLAGS -I$withval/include"
@@ -78,17 +66,8 @@
edb_libs=`edb-config --libs`
edb_cflags=`edb-config --cflags`
-AC_ARG_WITH(ecore,
- [ --with-ecore=DIR use ecore in <DIR>],
- [CFLAGS="$CFLAGS -I$withval/include"
- LIBS="-L$withval/lib $LIBS"])
-
-AC_PATH_GENERIC(ecore,, [
- AC_SUBST(ecore_libs)
- AC_SUBST(ecore_cflags)],
- AC_MSG_ERROR(Cannot find ecore: Is ecore-config in path?))
-ecore_libs=`ecore-config --libs`
-ecore_cflags=`ecore-config --cflags`
+CFLAGS="$CFLAGS $edb_cflags"
+LIBS="$LIBS $edb_libs"
AC_ARG_WITH(evas,
[ --with-evas=DIR use evas in <DIR>],
@@ -102,6 +81,9 @@
evas_libs=`evas-config --libs`
evas_cflags=`evas-config --cflags`
+CFLAGS="$CFLAGS $evas_cflags"
+LIBS="$LIBS $evas_libs"
+
AC_CHECK_HEADERS(Evas_Engine_Software_X11.h, [], [], [
#include <Evas.h>
])
@@ -110,6 +92,36 @@
#include <Evas.h>
])
+AC_ARG_WITH(ecore,
+ [ --with-ecore=DIR use ecore in <DIR>],
+ [CFLAGS="$CFLAGS -I$withval/include"
+ LIBS="-L$withval/lib $LIBS"])
+
+AC_PATH_GENERIC(ecore,, [
+ AC_SUBST(ecore_libs)
+ AC_SUBST(ecore_cflags)],
+ AC_MSG_ERROR(Cannot find ecore: Is ecore-config in path?))
+ecore_libs=`ecore-config --libs`
+ecore_cflags=`ecore-config --cflags`
+
+CFLAGS="$CFLAGS $ecore_cflags"
+LIBS="$LIBS $ecore_libs"
+
+AC_ARG_WITH(edje,
+ [ --with-edje=DIR use edje in <DIR>],
+ [CFLAGS="$CFLAGS -I$withval/include"
+ LIBS="-L$withval/lib $LIBS"])
+
+AC_PATH_GENERIC(edje,, [
+ AC_SUBST(edje_libs)
+ AC_SUBST(edje_cflags)],
+ AC_MSG_ERROR(Cannot find edje: Is edje-config in path?))
+edje_libs=`edje-config --libs`
+edje_cflags=`edje-config --cflags`
+
+CFLAGS="$CFLAGS $edje_cflags"
+LIBS="$LIBS $edje_libs"
+
AC_ARG_WITH(etox,
[ --with-etox=DIR use etox in <DIR>],
[CFLAGS="$CFLAGS -I$withval/include"
@@ -122,6 +134,9 @@
etox_libs=`etox-config --libs`
etox_cflags=`etox-config --cflags`
+CFLAGS="$CFLAGS $etox_cflags"
+LIBS="$LIBS $etox_libs"
+
AC_ARG_WITH(ewd,
[ --with-ewd=DIR use ewd in <DIR>],
[CFLAGS="$CFLAGS -I$withval/include"
@@ -134,6 +149,8 @@
ewd_libs=`ewd-config --libs`
ewd_cflags=`ewd-config --cflags`
+CFLAGS="$CFLAGS $ewd_cflags"
+LIBS="$LIBS $ewd_libs"
dnl Checking for Perl:
AC_PATH_PROG(PERL,perl,0)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/configure.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- configure.in 4 Nov 2003 07:16:45 -0000 1.23
+++ configure.in 14 Nov 2003 06:07:06 -0000 1.24
@@ -44,18 +44,6 @@
fi
changequote([,])dnl
-AC_ARG_WITH(edje,
- [ --with-edje=DIR use edje in <DIR>],
- [CFLAGS="$CFLAGS -I$withval/include"
- LIBS="-L$withval/lib $LIBS"])
-
-AC_PATH_GENERIC(edje,, [
- AC_SUBST(edje_libs)
- AC_SUBST(edje_cflags)],
- AC_MSG_ERROR(Cannot find edje: Is edje-config in path?))
-edje_libs=`edje-config --libs`
-edje_cflags=`edje-config --cflags`
-
AC_ARG_WITH(edb,
[ --with-edb=DIR use edb in <DIR>],
[CFLAGS="$CFLAGS -I$withval/include"
@@ -68,6 +56,32 @@
edb_libs=`edb-config --libs`
edb_cflags=`edb-config --cflags`
+CFLAGS="$CFLAGS $edb_cflags"
+LIBS="$LIBS $edb_libs"
+
+AC_ARG_WITH(evas,
+ [ --with-evas=DIR use evas in <DIR>],
+ [CFLAGS="$CFLAGS -I$withval/include"
+ LIBS="-L$withval/lib $LIBS"])
+
+AC_PATH_GENERIC(evas,, [
+ AC_SUBST(evas_libs)
+ AC_SUBST(evas_cflags)],
+ AC_MSG_ERROR(Cannot find evas: Is evas-config in path?))
+evas_libs=`evas-config --libs`
+evas_cflags=`evas-config --cflags`
+
+CFLAGS="$CFLAGS $evas_cflags"
+LIBS="$LIBS $evas_libs"
+
+AC_CHECK_HEADERS(Evas_Engine_Software_X11.h, [], [], [
+ #include <Evas.h>
+ ])
+
+AC_CHECK_HEADERS(Evas_Engine_GL_X11.h, [], [], [
+ #include <Evas.h>
+ ])
+
AC_ARG_WITH(ecore,
[ --with-ecore=DIR use ecore in <DIR>],
[CFLAGS="$CFLAGS -I$withval/include"
@@ -80,25 +94,23 @@
ecore_libs=`ecore-config --libs`
ecore_cflags=`ecore-config --cflags`
-AC_ARG_WITH(evas,
- [ --with-evas=DIR use evas in <DIR>],
+CFLAGS="$CFLAGS $ecore_cflags"
+LIBS="$LIBS $ecore_libs"
+
+AC_ARG_WITH(edje,
+ [ --with-edje=DIR use edje in <DIR>],
[CFLAGS="$CFLAGS -I$withval/include"
LIBS="-L$withval/lib $LIBS"])
-AC_CHECK_HEADERS(Evas_Engine_Software_X11.h, [], [], [
- #include <Evas.h>
- ])
-
-AC_CHECK_HEADERS(Evas_Engine_GL_X11.h, [], [], [
- #include <Evas.h>
- ])
+AC_PATH_GENERIC(edje,, [
+ AC_SUBST(edje_libs)
+ AC_SUBST(edje_cflags)],
+ AC_MSG_ERROR(Cannot find edje: Is edje-config in path?))
+edje_libs=`edje-config --libs`
+edje_cflags=`edje-config --cflags`
-AC_PATH_GENERIC(evas,, [
- AC_SUBST(evas_libs)
- AC_SUBST(evas_cflags)],
- AC_MSG_ERROR(Cannot find evas: Is evas-config in path?))
-evas_libs=`evas-config --libs`
-evas_cflags=`evas-config --cflags`
+CFLAGS="$CFLAGS $edje_cflags"
+LIBS="$LIBS $edje_libs"
AC_ARG_WITH(etox,
[ --with-etox=DIR use etox in <DIR>],
@@ -112,6 +124,9 @@
etox_libs=`etox-config --libs`
etox_cflags=`etox-config --cflags`
+CFLAGS="$CFLAGS $etox_cflags"
+LIBS="$LIBS $etox_libs"
+
AC_ARG_WITH(ewd,
[ --with-ewd=DIR use ewd in <DIR>],
[CFLAGS="$CFLAGS -I$withval/include"
@@ -124,6 +139,8 @@
ewd_libs=`ewd-config --libs`
ewd_cflags=`ewd-config --cflags`
+CFLAGS="$CFLAGS $ewd_cflags"
+LIBS="$LIBS $ewd_libs"
dnl Checking for Perl:
AC_PATH_PROG(PERL,perl,0)
-------------------------------------------------------
This SF.Net email sponsored by: ApacheCon 2003,
16-19 November in Las Vegas. Learn firsthand the latest
developments in Apache, PHP, Perl, XML, Java, MySQL,
WebDAV, and more! http://www.apachecon.com/
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
