diff --git a/legacy/efreet/Makefile.am b/legacy/efreet/Makefile.am index cf43cddce0..39853b7ffc 100644 --- a/legacy/efreet/Makefile.am +++ b/legacy/efreet/Makefile.am @@ -7,3 +7,5 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \ bin_SCRIPTS = efreet-config +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = efreet.pc diff --git a/legacy/efreet/configure.in b/legacy/efreet/configure.in index 9bbc067eec..5779bbc550 100644 --- a/legacy/efreet/configure.in +++ b/legacy/efreet/configure.in @@ -18,40 +18,30 @@ AC_DEFINE_DIR([PACKAGE_DATA_DIR], [datadir], [Shared Data Directory.]) 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. +PKG_CHECK_MODULES(ECORE, [ecore >= 0.9.9 ecore-file >= 0.9.9]) -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. -]) - ] -) 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 @@ CFLAGS=$PCFLAGS AC_SUBST(requirements) AC_OUTPUT([ efreet-config +efreet.pc Makefile src/Makefile src/lib/Makefile diff --git a/legacy/efreet/efreet.pc.in b/legacy/efreet/efreet.pc.in new file mode 100644 index 0000000000..4812b39267 --- /dev/null +++ b/legacy/efreet/efreet.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: efreet +Description: Freedesktop standards implementation for the EFL +Requires: @requirements@ +Version: @VERSION@ +Libs: -L${libdir} -lefreet +Cflags: -I${includedir}