Enlightenment CVS committal
Author : tilman
Project : e17
Module : libs/esmart
Dir : e17/libs/esmart
Modified Files:
configure.in esmart.pc.in
Log Message:
only build those components of esmart for which we have the requirements. use
pkg-config to detect those (for the most part).
===================================================================
RCS file: /cvs/e/e17/libs/esmart/configure.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- configure.in 11 Jun 2006 10:23:47 -0000 1.16
+++ configure.in 21 Mar 2007 13:22:42 -0000 1.17
@@ -42,41 +42,69 @@
fi
changequote([,])dnl
-AC_CHECK_HEADER(ltdl.h,,
- AC_MSG_ERROR(Cannot find ltdl.h. Please make sure you have the
libltdl-dev package installed.))
+PKG_CHECK_MODULES(EVAS, evas >= 0.9.9)
+requirements="evas"
-AC_PATH_GENERIC(evas, 0.9.9,
- [ ],
- [ AC_MSG_ERROR(Cannot find evas: Is evas-config in path?) ]
-)
+AC_CHECK_HEADER(ltdl.h, have_esmart_container=yes, have_esmart_container=no)
-AC_PATH_GENERIC(ecore, 0.9.9,
- [ ],
- [ AC_MSG_ERROR(Cannot find ecore: Is ecore-config in path?) ]
+AC_PATH_GENERIC(ecore, 0.9.9, [
+ have_esmart_draggies=yes
+ requirements="$requirements ecore"
+ ], [
+ have_esmart_draggies=no
+ ]
)
+
ECORE_LIBS_X=`$ECORE_CONFIG --libs-x`
ECORE_LIBS_EVAS=`$ECORE_CONFIG --libs-evas`
AC_SUBST(ECORE_LIBS_X)
AC_SUBST(ECORE_LIBS_EVAS)
-AC_PATH_GENERIC(imlib2, 1.0.0,
- [ ],
- [ AC_MSG_ERROR(Cannot find imlib2: Is imlib2-config in the path?) ]
-)
+PKG_CHECK_MODULES(IMLIB2, [imlib2 >= 1.0.0], [
+ have_esmart_trans_x11=yes
+ have_esmart_thumb=yes
+ requirements="$requirements imlib2"
+ ], [
+ have_esmart_trans_x11=no
+ have_esmart_thumb=no
+ ]
+)
+
+PKG_CHECK_MODULES(EPSILON, [epsilon >= 0.3.0], [
+ have_esmart_thumb=yes
+ requirements="$requirements epsilon"
+ ], [
+ have_esmart_thumb=no
+ ]
+)
+
+PKG_CHECK_MODULES(EDJE, [edje >= 0.5.0], [
+ have_esmart_text_entry=yes
+ have_esmart_file_dialog=yes
+ requirements="$requirements edje"
+ ], [
+ have_esmart_text_entry=no
+ have_esmart_file_dialog=no
+ ]
+)
+
+have_esmart_textarea=no
+
+AM_CONDITIONAL(BUILD_ESMART_CONTAINER, test $have_esmart_container = yes)
+AM_CONDITIONAL(BUILD_ESMART_DRAGGIES, test $have_esmart_draggies = yes)
+AM_CONDITIONAL(BUILD_ESMART_FILE_DIALOG, test $have_esmart_file_dialog = yes)
+AM_CONDITIONAL(BUILD_ESMART_TEXT_ENTRY, test $have_esmart_text_entry = yes)
+AM_CONDITIONAL(BUILD_ESMART_TEXTAREA, test $have_esmart_textarea = yes)
+AM_CONDITIONAL(BUILD_ESMART_THUMB, test $have_esmart_thumb = yes)
+AM_CONDITIONAL(BUILD_ESMART_TRANS_X11, test $have_esmart_trans_x11 = yes)
-AC_PATH_GENERIC(epsilon, 0.3.0,
- [ ],
- [ AC_MSG_ERROR(Cannot find epsilon: Is epsilon-config in path?) ]
-)
-
-AC_PATH_GENERIC(edje, 0.5.0,
- [ ],
- [ AC_MSG_ERROR(Cannot find edje: Is edje-config in path?) ]
-)
+AM_CONDITIONAL(BUILD_TEST_APP, test $have_esmart_container = yes -a
$have_esmart_thumb = yes)
AC_PATH_PROG(PERL, perl, 0)
AC_SUBST(PERL)
+AC_SUBST(requirements)
+
AC_OUTPUT([
Makefile
esmart.pc
@@ -103,3 +131,27 @@
]
)
+echo
+echo
+echo
+echo "------------------------------------------------------------------------"
+echo "$PACKAGE $VERSION"
+echo "------------------------------------------------------------------------"
+echo
+echo "Configuration Options Summary:"
+echo
+echo "Components:"
+echo " Container...............: $have_esmart_container"
+echo " Draggies................: $have_esmart_draggies"
+echo " File Dialog.............: $have_esmart_file_dialog"
+echo " Text Entry..............: $have_esmart_text_entry"
+echo " Text Area...............: $have_esmart_textarea"
+echo " Thumb...................: $have_esmart_thumb"
+echo " Trans X11...............: $have_esmart_trans_x11"
+echo
+echo "------------------------------------------------------------------------"
+echo
+echo "Now type 'make' ('gmake' on some systems) to compile $PACKAGE,"
+echo "and then afterwards as root (or the user who will install this), type"
+echo "'make install'. Change users with 'su' or 'sudo' appropriately."
+echo
===================================================================
RCS file: /cvs/e/e17/libs/esmart/esmart.pc.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- esmart.pc.in 5 May 2004 06:21:43 -0000 1.3
+++ esmart.pc.in 21 Mar 2007 13:22:42 -0000 1.4
@@ -6,7 +6,6 @@
Name: esmart
Description: A collection of evas smart object
Version: @VERSION@
-Requires: evas >= 1.0.0 ecore imlib2
+Requires: @requirements@
Libs: -L${libdir} -lm
Cflags: -I${includedir}
-
-------------------------------------------------------------------------
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
