Enlightenment CVS committal
Author : doursse
Project : e17
Module : proto
Dir : e17/proto/epdf
Modified Files:
Makefile.am configure.in
Added Files:
acinclude.m4
Removed Files:
epdf-config.in
Log Message:
update to new etk and ewl api, use newest source of poppler, move ewl plugin to
its own dir, add epsilon plugin to remove circular dependancy between epdf,
epsilon and ewl, various fixes
===================================================================
RCS file: /cvs/e/e17/proto/epdf/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Makefile.am 6 Apr 2006 07:12:37 -0000 1.3
+++ Makefile.am 7 Jul 2007 16:12:08 -0000 1.4
@@ -1,4 +1,3 @@
-ACLOCAL_AMFLAGS = -I m4
SUBDIRS = src
@@ -7,9 +6,7 @@
depcomp install-sh ltconfig ltmain.sh missing \
stamp-h.in
-bin_SCRIPTS = epdf-config
-
-EXTRA_DIST = AUTHORS README epdf.pc.in epdf-config.in
+EXTRA_DIST = AUTHORS README epdf.pc.in
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = epdf.pc
===================================================================
RCS file: /cvs/e/e17/proto/epdf/configure.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- configure.in 25 Jun 2007 10:44:32 -0000 1.7
+++ configure.in 7 Jul 2007 16:12:08 -0000 1.8
@@ -1,98 +1,68 @@
AC_PREREQ(2.54)
AC_INIT(epdf, 0.1, [EMAIL PROTECTED])
AC_CONFIG_HEADERS(config.h)
-AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE
+
+AM_INIT_AUTOMAKE(1.6)
+
+AC_LIBTOOL_TAGS([])
AC_PROG_LIBTOOL
AC_PROG_CC
AM_PROG_CC_C_O
+AC_PROG_CXX
-PKG_CHECK_MODULES(POPPLER, \
- poppler >= 0.5.3,
- [have_poppler=yes],
- [
- echo "ERROR:"
- echo "The poppler.pc development file was not found in your pkg-config"
- echo "path. This may mean one of several things"
- echo "1. You may not have installed the CVS version of poppler (current"
- echo " 0.5.3 version)."
- echo "2. You may not have installed the poppler-devel (or poppler-dev)"
- echo " packages."
- echo "3. 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 poppler.pc file is in your pkg-config path (see your"
- echo "shell's manual page on setting the \$PKG_CONFIG_PATH environment
variable)."
- AC_MSG_ERROR([Fatal Error: no popppler library detected.])
- ]
-)
+poppler_version=0.5.9
+evas_version=0.9.9
+ecore_version=0.9.9
+
+PKG_CHECK_MODULES(EPDF,
+ poppler >= ${poppler_version} evas >= ${evas_version} ecore >=
${ecore_version})
POPPLER_VERSION=`pkg-config --modversion poppler`
AC_DEFINE_UNQUOTED([POPPLER_VERSION], ["${POPPLER_VERSION}"], [Poppler
version.])
-AC_PATH_GENERIC(evas, 0.9.9,
- [ ],
+requirements="popler evas ecore"
+
+PKG_CHECK_MODULES(EWL,
+ ewl >= 0.5,
+ [
+ have_ewl="yes"
+ requirements="$requirements ewl"
+ EWL_TEST_LIBS_DIR="`$PKG_CONFIG --variable=testsdir ewl`"
+ EWL_TEST_SOURCE_DIR="`$PKG_CONFIG --variable=testssrcdir ewl`"
+ AC_SUBST(EWL_TEST_LIBS_DIR)
+ AC_SUBST(EWL_TEST_SOURCE_DIR)
+ ],
[
- 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.])
+ have_ewl="no"
]
)
+AM_CONDITIONAL(BUILD_EPDF_EWL, test "x${have_ewl}" = "xyes")
-AC_PATH_GENERIC(ecore, 0.9.9,
- [ ],
+PKG_CHECK_MODULES(ETK,
+ etk >= 0.1,
[
- 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.])
+ have_etk="yes"
+ requirements="$requirements etk"
+ ],
+ [
+ have_etk="no"
]
)
+AM_CONDITIONAL(BUILD_EPDF_ETK, test "x${have_etk}" = "xyes")
-requirements="evas ecore"
-
-AC_PATH_GENERIC(ewl, 0.0.4, [have_ewl="yes"], [have_ewl="no"])
-if test "x$have_ewl" = "xyes" ; then
- requirements="$requirements ewl"
- EWL_TEST_LIBS_DIR="`ewl-config --test-lib-dir`"
- EWL_TEST_SOURCE_DIR="`ewl-config --test-src-dir`"
- AC_SUBST(EWL_TEST_LIBS_DIR)
- AC_SUBST(EWL_TEST_SOURCE_DIR)
-else
- EWL_CFLAGS=""
- EWL_LIBS=""
- AC_SUBST(EWL_CFLAGS)
- AC_SUBST(EWL_LIBS)
-fi
-AM_CONDITIONAL(BUILD_EPDF_EWL, test x$have_ewl = xyes)
-
-AC_PATH_GENERIC(etk, 0.1.0, [have_etk="yes"], [have_etk="no"])
-if test "x$have_etk" = "xyes" ; then
- requirements="$requirements etk"
-else
- ETK_CFLAGS=""
- ETK_LIBS=""
- AC_SUBST(ETK_CFLAGS)
- AC_SUBST(ETK_LIBS)
-fi
-AM_CONDITIONAL(BUILD_EPDF_ETK, test x$have_etk = xyes)
+PKG_CHECK_MODULES(EPSILON,
+ imlib2 >= 1.4 epsilon >= 0.3,
+ [
+ have_epsilon="yes"
+ requirements="$requirements epsilon imlib2"
+ EPSILON_PLUGINS_DIR="`$PKG_CONFIG --variable=pluginsdir epsilon`"
+ AC_SUBST(EPSILON_PLUGINS_DIR)
+ ],
+ [
+ have_epsilon="no"
+ ]
+)
+AM_CONDITIONAL(BUILD_EPDF_EPSILON, test "x${have_epsilon}" = "xyes")
AC_SUBST(requirements)
@@ -102,32 +72,27 @@
src/Makefile
src/lib/Makefile
src/bin/Makefile
-epdf-config
-],[
-chmod +x epdf-config
+src/plugins/Makefile
+src/plugins/epsilon/Makefile
+src/plugins/ewl/Makefile
])
#####################################################################
## Info
echo
-echo
-echo
echo "------------------------------------------------------------------------"
-echo "$PACKAGE_NAME $PACKAGE_VERSION"
+echo " $PACKAGE_NAME $PACKAGE_VERSION"
echo "------------------------------------------------------------------------"
echo
echo "Configuration Options Summary:"
echo
echo " Ewl widget...........: $have_ewl"
echo " Etk widget...........: $have_etk"
+echo " Epsilon plugin.......: ${have_epsilon}"
echo
echo " Compilation..........: make"
echo
echo " Installation.........: make install"
-echo
-echo " prefix.........: $prefix"
-echo " binaries.......: $bindir"
-echo " libraries......: $libdir"
-echo " headers........: $includedir"
+echo " prefix.............: $prefix"
echo
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
