Enlightenment CVS committal
Author : mekius
Project : e17
Module : proto
Dir : e17/proto/empower
Modified Files:
configure.in
Log Message:
Continued changes made by UnixTitan to support pkg-config.
Also was able to remove all the files in m4. Bitchin!
===================================================================
RCS file: /cvs/e/e17/proto/empower/configure.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- configure.in 23 Mar 2007 02:27:15 -0000 1.7
+++ configure.in 23 Mar 2007 03:09:18 -0000 1.8
@@ -63,40 +63,28 @@
AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [Source code
directory])
PKG_CHECK_MODULES([EVAS], evas,
+ [],
[
- ],
- [
- echo "Evas was not found by pkg-config!";
- AC_MSG_ERROR([Empower needs evas to compile.])
+ echo "Could not find Evas. If it is installed, \nplease make sure its
path is in PKG_CONFIG_PATH";
+ AC_MSG_ERROR([Empower needs Evas to compile.])
]
)
PKG_CHECK_MODULES([ECORE], ecore,
+ [],
[
- ],
- [
- echo "Ecore was not found by pkg-config!";
- AC_MSG_ERROR([Empower needs ecore to compile.])
+ echo "Could not find Ecore. If it is installed, \nplease make sure its
path is in PKG_CONFIG_PATH";
+ AC_MSG_ERROR([Empower needs Ecore to compile.])
]
)
-#PROG="ewl-config";
-#AC_PATH_PROG(EWL_CONFIG, $PROG, "", $PATH)
-#if test -z "$EWL_CONFIG" ; then.
-# echo $PROG " is not in your \$PATH. Please ensure it is.";
-# echo "Read the manual page for your shell as to how to extend your path.";
-# AC_MSG_ERROR(Cannot find $PROG)
-#fi
-
-
-#PROG="etk-config";
-#AC_PATH_PROG(ETK_CONFIG, $PROG, "", $PATH)
-#if test -z "$ETK_CONFIG" ; then
-# echo $PROG " is not in your \$PATH. Please ensure it is.";
-# echo "Read the manual page for your shell as to how to extend your path.";
-# AC_MSG_ERROR(Cannot find $PROG)
-#fi
-
+PKG_CHECK_MODULES([EDJE], edje,
+ [],
+ [
+ echo "Could not find Edje. If it is installed, \nplease make sure its
path is in PKG_CONFIG_PATH";
+ AC_MSG_ERROR([Empower needs Edje to compile.])
+ ]
+)
AC_ARG_ENABLE(ewl,
AC_HELP_STRING([--enable-ewl/--disable-ewl],
@@ -104,15 +92,13 @@
[enable_ewl=$enableval ], [ enable_ewl=default])
if test "x$enable_ewl" = "xdefault" || test "x$enable_ewl" = "xyes"; then
-PKG_CHECK_MODULES([EWL], ewl >= 0.4.0,
- [
- enable_ewl="Yes"
- ],
- [
- enable_ewl="No"
- echo "Ewl was not found by pkg-config!";
- AC_MSG_ERROR([Empower needs ewl to compile.])
- ]
+ PKG_CHECK_MODULES([EWL], ewl >= 0.4.0,
+ [ enable_ewl="yes" ],
+ [
+ enable_ewl="no"
+ echo "Could not find Ewl. If it is installed, \nplease make sure its
path is in PKG_CONFIG_PATH";
+ AC_MSG_ERROR([Empower needs Ewl to compile the Ewl version.])
+ ]
)
fi
@@ -124,17 +110,14 @@
[enable_etk=$enableval], [enable_etk=default])
if test "x$enable_etk" = "xdefault" || test "x$enable_etk" = "xyes"; then
-PKG_CHECK_MODULES([ETK], etk >= 0.1.0,
- [
- enable_etk="Yes"
- ],
- [
- enable_etk="No"
- echo "Etk was not found by pkg-config!";
- AC_MSG_ERROR([Empower needs etk to compile.])
- ]
+ PKG_CHECK_MODULES([ETK], etk >= 0.1.0,
+ [ enable_etk="yes" ],
+ [
+ enable_etk="no"
+ echo "Could not find Etk. If it is installed, \nplease make sure its
path is in PKG_CONFIG_PATH";
+ AC_MSG_ERROR([Empower needs Etk to compile the Etk version.])
+ ]
)
-
fi
AM_CONDITIONAL(ENABLE_ETK, test x$enable_etk = xyes)
@@ -147,19 +130,6 @@
AM_CONDITIONAL(BUILD_SEPARATE, test x$build_separate = xyes)
-#AC_DEFINE_UNQUOTED(HAVE_EWL, "${have_ewl}", [EWL])
-#AC_DEFINE_UNQUOTED(HAVE_ETK, "${have_etk}", [ETK])
-
-
-PKG_CHECK_MODULES([EDJE], edje,
- [
- ],
- [
- echo "Edje was not found by pkg-config!";
- AC_MSG_ERROR([Empower needs edje to compile.])
- ]
-)
-
AC_OUTPUT([
Makefile
empower.spec
@@ -182,4 +152,3 @@
echo
echo " Building Seperate Binaries $build_separate"
echo
-
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
