Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore
Modified Files:
acconfig.h conf-e-x11.sh configure.in ecore-config.in
make_cross_compile_arm.sh
Log Message:
text utility routines... iconv wrapper there :)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/acconfig.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- acconfig.h 23 Sep 2003 08:09:19 -0000 1.4
+++ acconfig.h 9 Oct 2003 07:49:59 -0000 1.5
@@ -9,3 +9,4 @@
#undef BUILD_ECORE_X
#undef BUILD_ECORE_CON
#undef BUILD_ECORE_IPC
+#undef BUILD_ECORE_TXT
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/conf-e-x11.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- conf-e-x11.sh 3 Oct 2003 22:27:51 -0000 1.3
+++ conf-e-x11.sh 9 Oct 2003 07:49:59 -0000 1.4
@@ -14,4 +14,5 @@
--enable-ecore-job \
--enable-ecore-con \
--enable-ecore-ipc \
+--enable-ecore-txt \
$@
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/configure.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- configure.in 23 Sep 2003 08:09:19 -0000 1.11
+++ configure.in 9 Oct 2003 07:49:59 -0000 1.12
@@ -263,6 +263,34 @@
AC_SUBST(ecore_ipc_cflags)
AC_SUBST(ecore_ipc_libs)
+
+AC_MSG_CHECKING(whether ecore_txt module is to be built)
+
+# FIXME: detect if we need -liconv or not for iconv_libs
+iconv_cflags=""
+iconv_libs=""
+
+ecore_txt_cflags="";
+ecore_txt_libs="";
+
+AC_ARG_ENABLE(ecore-txt,
+[ --enable-ecore-txt enable the ecore_txt module], [
+ AC_MSG_RESULT(yes)
+ AM_CONDITIONAL(BUILD_ECORE_TXT, test "$enableval" = "yes")
+ AC_DEFINE(BUILD_ECORE_TXT)
+ ecore_txt_libs="-lecore_txt"
+], [
+ AC_MSG_RESULT(no)
+ AM_CONDITIONAL(BUILD_ECORE_TXT, false)
+]
+)
+
+AC_SUBST(iconv_cflags)
+AC_SUBST(iconv_libs)
+
+AC_SUBST(ecore_txt_cflags)
+AC_SUBST(ecore_txt_libs)
+
AC_OUTPUT([
Makefile
ecore-config
@@ -276,6 +304,7 @@
src/lib/ecore_evas/Makefile
src/lib/ecore_con/Makefile
src/lib/ecore_ipc/Makefile
+src/lib/ecore_txt/Makefile
debian/Makefile
], [
chmod +x ecore-config
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/ecore-config.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ecore-config.in 23 Sep 2003 08:09:19 -0000 1.3
+++ ecore-config.in 9 Oct 2003 07:49:59 -0000 1.4
@@ -46,7 +46,7 @@
;;
--libs)
[EMAIL PROTECTED]@
- echo $libdirs -lecore @ecore_job_libs@ @ecore_x_libs@ @ecore_evas_libs@
@ecore_con_libs@ @ecore_ipc_libs@ @ecore_fb_libs@ -lm
+ echo $libdirs -lecore @ecore_job_libs@ @ecore_x_libs@ @ecore_evas_libs@
@ecore_con_libs@ @ecore_ipc_libs@ @ecore_txt_libs@ @ecore_fb_libs@ -lm
;;
*)
echo "${usage}" 1>&2
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ecore/make_cross_compile_arm.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- make_cross_compile_arm.sh 23 Sep 2003 08:09:19 -0000 1.2
+++ make_cross_compile_arm.sh 9 Oct 2003 07:49:59 -0000 1.3
@@ -6,7 +6,8 @@
--enable-ecore-evas \
--enable-ecore-job \
--enable-ecore-con \
---enable-ecore-ipc
+--enable-ecore-ipc \
+--enable-ecore-txt
CC="/skiff/local/bin/arm-linux-gcc"
ST="/skiff/local/bin/arm-linux-strip"
@@ -26,13 +27,13 @@
pushd lib
- for I in ecore ecore_fb ecore_job ecore_evas ecore_con ecore_ipc; do
+ for I in ecore ecore_fb ecore_job ecore_evas ecore_con ecore_ipc ecore_txt; do
LIB=$I
pushd $LIB
$CC \
*.c \
$CFLAGS \
- -I. -I../ecore -I../ecore_x -I../ecore_fb -I../ecore_job -I../ecore_evas
-I../ecore_con -I../ecore_ipc \
+ -I. -I../ecore -I../ecore_x -I../ecore_fb -I../ecore_job -I../ecore_evas
-I../ecore_con -I../ecore_ipc -I../ecore_txt \
-I../../.. \
-I/skiff/local/include \
-shared -fPIC -DPIC \
@@ -56,10 +57,10 @@
BIN="ecore_test"
$CC $BIN".c" \
-I../.. -I../lib \
- -I. -I../lib/ecore -I../lib/ecore_x -I../lib/ecore_fb -I../lib/ecore_job
-I../lib/ecore_evas -I../lib/ecore_con -I../lib/ecore_ipc \
+ -I. -I../lib/ecore -I../lib/ecore_x -I../lib/ecore_fb -I../lib/ecore_job
-I../lib/ecore_evas -I../lib/ecore_con -I../lib/ecore_ipc -I../lib/ecore_txt \
-I/skiff/local/include \
- -L. -L../lib/ecore -L../lib/ecore_x -L../lib/ecore_fb -L../lib/ecore_job
-L../lib/ecore_evas -L../lib/ecore_con -L../lib/ecore_ipc \
- -lecore -lecore_evas -lecore_fb -lecore_job -lecore_con -lecore_ipc -levas
-lfreetype -ljpeg -lpng -lz -lm \
+ -L. -L../lib/ecore -L../lib/ecore_x -L../lib/ecore_fb -L../lib/ecore_job
-L../lib/ecore_evas -L../lib/ecore_con -L../lib/ecore_ipc -L../lib/ecore_txt \
+ -lecore -lecore_evas -lecore_fb -lecore_job -lecore_con -lecore_ipc -lecore_txt
-levas -lfreetype -ljpeg -lpng -lz -lm \
-o $BIN
$ST $BIN
cp -a $BIN $DST"/bin";
@@ -70,10 +71,10 @@
ecore_evas_test_bg.c \
ecore_evas_test_calibrate.c \
-I../.. -I../lib \
- -I. -I../lib/ecore -I../lib/ecore_x -I../lib/ecore_fb -I../lib/ecore_job
-I../lib/ecore_evas -I../lib/ecore_con -I../lib/ecore_ipc \
+ -I. -I../lib/ecore -I../lib/ecore_x -I../lib/ecore_fb -I../lib/ecore_job
-I../lib/ecore_evas -I../lib/ecore_con -I../lib/ecore_ipc -I../lib/ecore_txt \
-I/skiff/local/include \
- -L. -L../lib/ecore -L../lib/ecore_x -L../lib/ecore_fb -L../lib/ecore_job
-L../lib/ecore_evas -L../lib/ecore_con -L../lib/ecore_ipc \
- -lecore -lecore_evas -lecore_fb -lecore_con -lecore_con -lecore_ipc -levas
-lfreetype -ljpeg -lpng -lz -lm \
+ -L. -L../lib/ecore -L../lib/ecore_x -L../lib/ecore_fb -L../lib/ecore_job
-L../lib/ecore_evas -L../lib/ecore_con -L../lib/ecore_ipc -L../lib/ecore_txt \
+ -lecore -lecore_evas -lecore_fb -lecore_con -lecore_con -lecore_ipc -lecore_txt
-levas -lfreetype -ljpeg -lpng -lz -lm \
-o $BIN
$ST $BIN
cp -a $BIN $DST"/bin";
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
SourceForge.net hosts over 70,000 Open Source Projects.
See the people who have HELPED US provide better services:
Click here: http://sourceforge.net/supporters.php
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
