Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl
Modified Files:
configure.in
Log Message:
Changes to autofoo for cross compiling.
Removed the building of extra eet's.
Textarea test of the prepend function.
Fixes for building w/o X support.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/configure.in,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -3 -r1.30 -r1.31
--- configure.in 14 May 2004 15:46:28 -0000 1.30
+++ configure.in 13 Jul 2004 16:15:41 -0000 1.31
@@ -1,6 +1,9 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(configure.in)
+AC_CANONICAL_BUILD
+AC_CANONICAL_HOST
+AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE(ewl, 0.0.3)
AM_CONFIG_HEADER(ewl-config.h)
@@ -52,35 +55,75 @@
fi
changequote([,])dnl
-AC_ARG_WITH(edb,
- [ --with-edb=DIR use edb in <DIR>],
- [CFLAGS="$CFLAGS -I$withval/include"
- LIBS="-L$withval/lib $LIBS"])
-
-AC_PATH_GENERIC(edb,, [
- AC_SUBST(edb_libs)
- AC_SUBST(edb_cflags)],
- AC_MSG_ERROR(Cannot find edb: Is edb-config in path?))
-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`
+EDB_CONFIG="edb-config"
+AC_ARG_WITH(edb-config,
+[ --with-edb-config=FILE edb-config script to use (eg /usr/bin/edb-config)],
+[
+ EDB_CONFIG=$withval
+ AC_CHECK_PROG(EDB_CONFIG_IN_PATH, $EDB_CONFIG, yes, no)
+ if test $EDB_CONFIG_IN_PATH = no; then
+ echo "ERROR:"
+ echo "The edb-config development script you specified:"
+ echo "$EDB_CONFIG"
+ echo "was not found. Please check the path and make sure "
+ echo "the script exists and is executable."
+ AC_MSG_ERROR([Fatal Error: no edb-config detected.])
+ exit;
+ fi
+],
+[
+ AC_CHECK_PROG(EDB_CONFIG_IN_PATH, $EDB_CONFIG, yes, no)
+ if test $EDB_CONFIG_IN_PATH = no; then
+ echo "ERROR:"
+ echo "The edb-config development script was not found in your execute"
+ echo "path. This may mean one of several things"
+ echo "1. You may not have installed the edb-devel (or edb-dev)"
+ echo " packages."
+ echo "2. You may have edb installed somewhere not covered by your path."
+ echo ""
+ echo "If this is the case make sure you have the packages installed, AND"
+ echo "that the edb-config script is in your execute path (see your"
+ echo "shell's manual page on setting the \$PATH environment variable), OR"
+ echo "alternatively, specify the script to use with --with-edb-config."
+ AC_MSG_ERROR([Fatal Error: no edb-config detected.])
+ exit;
+ fi
+])
-CFLAGS="$CFLAGS $evas_cflags"
-LIBS="$LIBS $evas_libs"
+EVAS_CONFIG="evas-config"
+AC_ARG_WITH(evas-config,
+[ --with-evas-config=FILE evas-config script to use (eg /usr/bin/evas-config)],
+[
+ EVAS_CONFIG=$withval
+ AC_CHECK_PROG(EVAS_CONFIG_IN_PATH, $EVAS_CONFIG, yes, no)
+ if test $EVAS_CONFIG_IN_PATH = no; then
+ echo "ERROR:"
+ echo "The evas-config development script you specified:"
+ echo "$EVAS_CONFIG"
+ echo "was not found. Please check the path and make sure "
+ echo "the script exists and is executable."
+ AC_MSG_ERROR([Fatal Error: no evas-config detected.])
+ exit;
+ fi
+],
+[
+ AC_CHECK_PROG(EVAS_CONFIG_IN_PATH, $EVAS_CONFIG, yes, no)
+ if test $EVAS_CONFIG_IN_PATH = no; then
+ echo "ERROR:"
+ echo "The evas-config development script was not found in your execute"
+ echo "path. This may mean one of several things"
+ echo "1. You may not have installed the evas-devel (or evas-dev)"
+ echo " packages."
+ echo "2. You may have evas installed somewhere not covered by your path."
+ echo ""
+ echo "If this is the case make sure you have the packages installed, AND"
+ echo "that the evas-config script is in your execute path (see your"
+ echo "shell's manual page on setting the \$PATH environment variable), OR"
+ echo "alternatively, specify the script to use with --with-evas-config."
+ AC_MSG_ERROR([Fatal Error: no evas-config detected.])
+ exit;
+ fi
+])
AC_CHECK_HEADERS(Evas_Engine_Software_X11.h, [], [], [
#include <Evas.h>
@@ -94,54 +137,135 @@
#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"
- LIBS="-L$withval/lib $LIBS"])
-
-AC_PATH_GENERIC(etox,, [
- AC_SUBST(etox_libs)
- AC_SUBST(etox_cflags)],
- AC_MSG_ERROR(Cannot find etox: Is etox-config in path?))
-etox_libs=`etox-config --libs`
-etox_cflags=`etox-config --cflags`
-
-CFLAGS="$CFLAGS $etox_cflags"
-LIBS="$LIBS $etox_libs"
-
-dnl Checking for Perl:
-AC_PATH_PROG(PERL,perl,0)
-AC_SUBST(PERL)
+ECORE_CONFIG="ecore-config"
+AC_ARG_WITH(ecore-config,
+[ --with-ecore-config=FILE ecore-config script to use (eg /usr/bin/ecore-config)],
+[
+ ECORE_CONFIG=$withval
+ AC_CHECK_PROG(ECORE_CONFIG_IN_PATH, $ECORE_CONFIG, yes, no)
+ if test $ECORE_CONFIG_IN_PATH = no; then
+ echo "ERROR:"
+ echo "The ecore-config development script you specified:"
+ echo "$ECORE_CONFIG"
+ echo "was not found. Please check the path and make sure "
+ echo "the script exists and is executable."
+ AC_MSG_ERROR([Fatal Error: no ecore-config detected.])
+ exit;
+ fi
+ ],
+[
+ AC_CHECK_PROG(ECORE_CONFIG_IN_PATH, $ECORE_CONFIG, yes, no)
+ if test $ECORE_CONFIG_IN_PATH = no; then
+ echo "ERROR:"
+ echo "The ecore-config development script was not found in your execute"
+ echo "path. This may mean one of several things"
+ echo "1. You may not have installed the ecore-devel (or ecore-dev)"
+ echo " packages."
+ echo "2. You may have ecore installed somewhere not covered by your path."
+ echo ""
+ echo "If this is the case make sure you have the packages installed, AND"
+ echo "that the ecore-config script is in your execute path (see your"
+ echo "shell's manual page on setting the \$PATH environment variable), OR"
+ echo "alternatively, specify the script to use with --with-ecore-config."
+ AC_MSG_ERROR([Fatal Error: no ecore-config detected.])
+ exit;
+ fi
+])
+
+ETOX_CONFIG="etox-config"
+AC_ARG_WITH(etox-config,
+[ --with-etox-config=FILE etox-config script to use (eg /usr/bin/etox-config)],
+[
+ ETOX_CONFIG=$withval
+ AC_CHECK_PROG(ETOX_CONFIG_IN_PATH, $ETOX_CONFIG, yes, no)
+ if test $ETOX_CONFIG_IN_PATH = no; then
+ echo "ERROR:"
+ echo "The etox-config development script you specified:"
+ echo "$ETOX_CONFIG"
+ echo "was not found. Please check the path and make sure "
+ echo "the script exists and is executable."
+ AC_MSG_ERROR([Fatal Error: no etox-config detected.])
+ exit;
+ fi
+ ],
+[
+ AC_CHECK_PROG(ETOX_CONFIG_IN_PATH, $ETOX_CONFIG, yes, no)
+ if test $ETOX_CONFIG_IN_PATH = no; then
+ echo "ERROR:"
+ echo "The etox-config development script was not found in your execute"
+ echo "path. This may mean one of several things"
+ echo "1. You may not have installed the etox-devel (or etox-dev)"
+ echo " packages."
+ echo "2. You may have etox installed somewhere not covered by your path."
+ echo ""
+ echo "If this is the case make sure you have the packages installed, AND"
+ echo "that the etox-config script is in your execute path (see your"
+ echo "shell's manual page on setting the \$PATH environment variable), OR"
+ echo "alternatively, specify the script to use with --with-etox-config."
+ AC_MSG_ERROR([Fatal Error: no etox-config detected.])
+ exit;
+ fi
+])
+
+EDJE_CONFIG="edje-config"
+AC_ARG_WITH(edje-config,
+[ --with-edje-config=FILE edje-config script to use (eg /usr/bin/edje-config)],
+[
+ EDJE_CONFIG=$withval
+ AC_CHECK_PROG(EDJE_CONFIG_IN_PATH, $EDJE_CONFIG, yes, no)
+ if test $EDJE_CONFIG_IN_PATH = no; then
+ echo "ERROR:"
+ echo "The edje-config development script you specified:"
+ echo "$EDJE_CONFIG"
+ echo "was not found. Please check the path and make sure "
+ echo "the script exists and is executable."
+ AC_MSG_ERROR([Fatal Error: no edje-config detected.])
+ exit;
+ fi
+ ],
+[
+ AC_CHECK_PROG(EDJE_CONFIG_IN_PATH, $EDJE_CONFIG, yes, no)
+ if test $EDJE_CONFIG_IN_PATH = no; then
+ echo "ERROR:"
+ echo "The edje-config development script was not found in your execute"
+ echo "path. This may mean one of several things"
+ echo "1. You may not have installed the edje-devel (or edje-dev)"
+ echo " packages."
+ echo "2. You may have edje installed somewhere not covered by your path."
+ echo ""
+ echo "If this is the case make sure you have the packages installed, AND"
+ echo "that the edje-config script is in your execute path (see your"
+ echo "shell's manual page on setting the \$PATH environment variable), OR"
+ echo "alternatively, specify the script to use with --with-edje-config."
+ AC_MSG_ERROR([Fatal Error: no edje-config detected.])
+ exit;
+ fi
+])
+
+AC_SUBST(edb_cflags)
+AC_SUBST(edb_libs)
+edb_cflags=`$EDB_CONFIG --cflags`
+edb_libs=`$EDB_CONFIG --libs`
+
+AC_SUBST(evas_cflags)
+AC_SUBST(evas_libs)
+evas_cflags=`$EVAS_CONFIG --cflags`
+evas_libs=`$EVAS_CONFIG --libs`
+
+AC_SUBST(ecore_cflags)
+AC_SUBST(ecore_libs)
+ecore_cflags=`$ECORE_CONFIG --cflags`
+ecore_libs=`$ECORE_CONFIG --libs`
+
+AC_SUBST(etox_cflags)
+AC_SUBST(etox_libs)
+etox_cflags=`$ETOX_CONFIG --cflags`
+etox_libs=`$ETOX_CONFIG --libs`
+
+AC_SUBST(edje_cflags)
+AC_SUBST(edje_libs)
+edje_cflags=`$EDJE_CONFIG --cflags`
+edje_libs=`$EDJE_CONFIG --libs`
AC_OUTPUT([
Makefile
@@ -153,14 +277,6 @@
data/Makefile
data/images/Makefile
data/themes/Makefile
-data/themes/default/Makefile
-data/themes/default/bits/Makefile
-data/themes/default/bits/images/Makefile
-data/themes/default/fonts/Makefile
-data/themes/skeleton/Makefile
-data/themes/skeleton/bits/Makefile
-data/themes/skeleton/bits/images/Makefile
-data/themes/skeleton/fonts/Makefile
], [
chmod +x ewl-config
]
-------------------------------------------------------
This SF.Net email sponsored by Black Hat Briefings & Training.
Attend Black Hat Briefings & Training, Las Vegas July 24-29 -
digital self defense, top technical experts, no vendor pitches,
unmatched networking opportunities. Visit www.blackhat.com
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
