Enlightenment CVS committal
Author : doursse
Project : e17
Module : proto/epdf
Dir : e17/proto/epdf
Modified Files:
ChangeLog configure.in
Log Message:
* configure.in:
* src/bin/Makefile.am:
* src/lib/Makefile.am:
* src/plugins/epsilon/Makefile.am:
* src/plugins/ewl/Makefile.am:
make epdf work on Windows. Add libtool versioning.
Check poppler 0.5.9 instead of 0.6. configure fails
if the xpdf headers are not found. Add options to
configure to disable ewl or etk.
* src/lib/poppler_index.cpp:
remove useless header.
* src/bin/epdf_evas_test.c: (main):
if software_x11 is not found, use software_ddraw.
===================================================================
RCS file: /cvs/e/e17/proto/epdf/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ChangeLog 29 Sep 2007 20:02:41 -0000 1.6
+++ ChangeLog 6 Oct 2007 18:22:34 -0000 1.7
@@ -1,3 +1,21 @@
+2007-10-06 Vincent Torri <doursse at users dot sf dot net>
+
+ * configure.in:
+ * src/bin/Makefile.am:
+ * src/lib/Makefile.am:
+ * src/plugins/epsilon/Makefile.am:
+ * src/plugins/ewl/Makefile.am:
+ make epdf work on Windows. Add libtool versioning.
+ Check poppler 0.5.9 instead of 0.6. configure fails
+ if the xpdf headers are not found. Add options to
+ configure to disable ewl or etk.
+
+ * src/lib/poppler_index.cpp:
+ remove useless header.
+
+ * src/bin/epdf_evas_test.c: (main):
+ if software_x11 is not found, use software_ddraw.
+
2007-09-29 Vincent Torri <doursse at users dot sf dot net>
* configure.in:
===================================================================
RCS file: /cvs/e/e17/proto/epdf/configure.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- configure.in 29 Sep 2007 20:02:41 -0000 1.11
+++ configure.in 6 Oct 2007 18:22:34 -0000 1.12
@@ -4,12 +4,31 @@
AM_INIT_AUTOMAKE(1.6)
+AC_LIBTOOL_WIN32_DLL
define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
AC_PROG_LIBTOOL
+INTERFACE_CURRENT="0"
+INTERFACE_REVISION="1"
+INTERFACE_AGE="0"
+version_info=${INTERFACE_CURRENT}:${INTERFACE_REVISION}:${INTERFACE_AGE}
+AC_SUBST(version_info)
+
AC_PROG_CC
-AM_PROG_CC_C_O
+AC_PROG_CPP
+AC_PROG_CC_C_O
AC_PROG_CXX
+AC_PROG_CXXCPP
+AC_PROG_CXX_C_O
+AC_LANG(C)
+
+create_shared_lib=""
+case "$host_os" in
+ mingw|mingw32)
+ create_shared_lib="-no-undefined"
+ ;;
+esac
+AC_SUBST(create_shared_lib)
evas_version=0.9.9
ecore_version=0.9.9
@@ -18,7 +37,11 @@
[ evas >= ${evas_version} ecore >= ${ecore_version} ]
)
-PKG_CHECK_MODULES(POPPLER, [ poppler >= 0.6 ],
+PKG_CHECK_MODULES(ECORE_EVAS,
+ [ ecore-evas >= ${ecore_version} ]
+)
+
+PKG_CHECK_MODULES(POPPLER, [ poppler >= 0.5.9 ],
[
have_poppler_0_6="yes"
AC_DEFINE([HAVE_POPPLER_0_6], [1], [Define to 1 if you have Poppler 0.6.])
@@ -31,6 +54,17 @@
[ AC_MSG_ERROR([No supported Poppler found.]) ]
)
fi
+
+AC_LANG_PUSH(C++)
+CPPFLAGS_save=$CPPFLAGS
+CPPFLAGS="$CPPFLAGS $POPPLER_CFLAGS"
+AC_CHECK_HEADER([GlobalParams.h],
+ [ dummy="yes" ],
+ [ AC_MSG_ERROR([Xpdf headers not found. Did you configure poppler with the
option --enable-xpdf-headers ?])]
+)
+CPPFLAGS=$CPPFLAGS_save
+AC_LANG_POP(C++)
+
POPPLER_VERSION=`pkg-config --modversion poppler`
AC_DEFINE_UNQUOTED([POPPLER_VERSION], ["${POPPLER_VERSION}"], [Poppler
version.])
@@ -41,32 +75,68 @@
requirements="poppler 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)
- ],
- [
- have_ewl="no"
+dnl Ewl
+AC_ARG_ENABLE(ewl,
+ AC_HELP_STRING(
+ [--enable-ewl],
+ [enable ewl widget. [[default=enabled]]]
+ ), [
+ have_ewl=$enableval
+ ], [
+ have_ewl="yes"
]
)
+AC_MSG_CHECKING(whether using Ewl)
+AC_MSG_RESULT($have_ewl)
+
+if test "x$have_ewl" = "xyes"; then
+ 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)
+ ],
+ [
+ have_ewl="no"
+ ]
+ )
+else
+ have_ewl="no"
+fi
AM_CONDITIONAL(BUILD_EPDF_EWL, test "x${have_ewl}" = "xyes")
-PKG_CHECK_MODULES(ETK,
- etk >= 0.1,
- [
- have_etk="yes"
- requirements="$requirements etk"
- ],
- [
- have_etk="no"
+dnl Etk
+AC_ARG_ENABLE(etk,
+ AC_HELP_STRING(
+ [--enable-etk],
+ [enable etk widget. [[default=enabled]]]
+ ), [
+ have_etk=$enableval
+ ], [
+ have_etk="yes"
]
)
+AC_MSG_CHECKING(whether using Etk)
+AC_MSG_RESULT($have_etk)
+
+if test "x$have_etk" = "xyes"; then
+ PKG_CHECK_MODULES(ETK,
+ etk >= 0.1,
+ [
+ have_etk="yes"
+ requirements="$requirements etk"
+ ],
+ [
+ have_etk="no"
+ ]
+ )
+else
+ have_etk="no"
+fi
AM_CONDITIONAL(BUILD_EPDF_ETK, test "x${have_etk}" = "xyes")
PKG_CHECK_MODULES(EPSILON,
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
