Enlightenment CVS committal
Author : tilman
Project : e17
Module : libs/efreet
Dir : e17/libs/efreet
Modified Files:
Makefile.am configure.in
Added Files:
efreet.pc.in
Log Message:
pkgconfig
===================================================================
RCS file: /cvs/e/e17/libs/efreet/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- Makefile.am 3 Feb 2007 13:09:22 -0000 1.1
+++ Makefile.am 21 Mar 2007 17:54:54 -0000 1.2
@@ -7,3 +7,5 @@
bin_SCRIPTS = efreet-config
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = efreet.pc
===================================================================
RCS file: /cvs/e/e17/libs/efreet/configure.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- configure.in 3 Feb 2007 13:05:29 -0000 1.1
+++ configure.in 21 Mar 2007 17:54:54 -0000 1.2
@@ -18,40 +18,30 @@
PCFLAGS=$CFLAGS
-AC_PATH_GENERIC(ecore, 0.9.9,
- [ ],
- [
-AC_MSG_ERROR([
-ERROR:
-The ecore-config development script was not found in your execute
-path. This may mean one of several things
-1. You may not have installed the ecore-devel (or ecore-dev) packages.
-2. You may have ecore installed somewhere not covered by your path.
-
-If this is the case make sure you have the packages installed, AND
-that the ecore-config script is in your execute path (see your
-shell's manual page on setting the \$PATH environment variable), OR
-alternatively, specify the script to use with --with-ecore-config.
-])
- ]
-)
+PKG_CHECK_MODULES(ECORE, [ecore >= 0.9.9 ecore-file >= 0.9.9])
+
CFLAGS=$ECORE_CFLAGS" "$CFLAGS
-requirements="ecore"
+requirements="ecore ecore-file"
AC_ARG_ENABLE(ecore-desktop,
[AC_HELP_STRING([--enable-ecore-desktop],[Enable Ecore_Desktop tests])],
[enable_ecore_desktop=$enableval], [enable_ecore_desktop="auto"])
+
have_ecore_desktop=no
+
if test "x$enable_ecore_desktop" != "xno" ; then
- AC_CHECK_HEADER(Ecore_Desktop.h,
- [have_ecore_desktop=yes],
- [], [])
- if test "x$have_ecore_desktop" = "xyes" ; then
- AC_DEFINE(ENABLE_ECORE_DESKTOP, 1, [Enable Ecore_Desktop])
- elif test "x$enable_ecore_desktop" = "xyes" ; then
- AC_MSG_ERROR(No Ecore_Desktop found disabling comparison tests.)
- fi
+ PKG_CHECK_MODULES(ECORE_DESKTOP, [ecore-desktop >= 0.9.9], [
+ have_ecore_desktop=yes
+ ], [
+ have_ecore_desktop=no
+ ])
+fi
+
+if test "x$have_ecore_desktop" = "xyes" ; then
+ AC_DEFINE(ENABLE_ECORE_DESKTOP, 1, [Enable Ecore_Desktop])
+elif test "x$enable_ecore_desktop" = "xyes" ; then
+ AC_MSG_ERROR(No Ecore_Desktop found disabling comparison tests.)
fi
AM_CONDITIONAL(HAVE_ECORE_DESKTOP, test "x$have_ecore_desktop" = xyes)
@@ -69,6 +59,7 @@
AC_SUBST(requirements)
AC_OUTPUT([
efreet-config
+efreet.pc
Makefile
src/Makefile
src/lib/Makefile
-------------------------------------------------------------------------
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
