Menu
▾
▴
E CVS: libs/etox redalb
|
From: <enl...@li...> - 2002-04-02 11:58:50
|
Enlightenment CVS committal
Author : redalb
Project : e17
Module : libs/etox
Dir : e17/libs/etox
Modified Files:
Tag: SPLIT
AUTHORS README configure.ac configure.in etox-config.h.in
etox-config.in
Log Message:
Committing new etox to split..
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/AUTHORS,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -3 -r1.3 -r1.3.2.1
--- AUTHORS 11 Apr 2001 23:27:28 -0000 1.3
+++ AUTHORS 2 Apr 2002 11:41:36 -0000 1.3.2.1
@@ -1,3 +1,4 @@
Mandrake <man...@ma...>
Adam Kisiel <ki...@if...>
BLAdER (redalb) <bl...@ne...>
+RbdPngn <ningerso@d.umn.edu>
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/README,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -3 -r1.4 -r1.4.2.1
--- README 17 Aug 2001 12:20:33 -0000 1.4
+++ README 2 Apr 2002 11:41:36 -0000 1.4.2.1
@@ -0,0 +1,11 @@
+Etox - An evas based text layout library
+----------------------------------------
+
+Etox provides facilities for multi-line text layout, as well as obstacle
+wrapping and text stylization.
+
+Todo:
++ etox_free
++ obstacle wrapping
++ region selection
++ columnar layout
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/configure.ac,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -3 -r1.3 -r1.3.2.1
--- configure.ac 1 Jan 2002 14:29:22 -0000 1.3
+++ configure.ac 2 Apr 2002 11:41:36 -0000 1.3.2.1
@@ -70,15 +70,16 @@
ewd_cflags=`ewd-config --cflags`
ewd_libs=`ewd-config --libs`
+AC_SUBST(estyle_cflags)
+AC_SUBST(estyle_libs)
+estyle_cflags=`estyle-config --cflags`
+estyle_libs=`estyle-config --libs`
+
AC_SUBST(imlib2_cflags)
AC_SUBST(imlib2_libs)
imlib2_cflags=`imlib2-config --cflags`
imlib2_libs=`imlib2-config --libs`
-dnl Checking for Perl:
-AC_PATH_PROG(PERL,perl,0)
-AC_SUBST(PERL)
-
dnl Look for jade for sgml translations.
AC_ARG_WITH(dbsheets,
[ --with-dbsheets=DIR use DIR to specify your DocBook stylesheets installation path.],
@@ -87,8 +88,6 @@
AC_PATH_PROG(JADE, jade)
AM_CONDITIONAL(HAVE_JADE, test "x$JADE" != "x" && test -d "$DB_STYLESHEETS")
-
-
AC_CONFIG_FILES([
Makefile
etox-config
@@ -97,13 +96,10 @@
doc/html-customizations.dsl
doc/Makefile
test/Makefile
-test/fnt/Makefile
test/img/Makefile
-test/style/Makefile
])
AC_CONFIG_COMMANDS([default],[[
chmod +x etox-config
-chmod +x doc/kernel-doc
]],[[]])
AC_OUTPUT
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/configure.in,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -u -3 -r1.8 -r1.8.2.1
--- configure.in 27 Dec 2001 15:37:53 -0000 1.8
+++ configure.in 2 Apr 2002 11:41:37 -0000 1.8.2.1
@@ -184,6 +184,41 @@
fi
])
+ESTYLE_CONFIG="estyle-config"
+AC_ARG_WITH(estyle,
+[ --with-estyle-config=FILE estyle-config script to use (eg /usr/bin/estyle-config)],
+[
+ ESTYLE_CONFIG=$withval
+ AC_CHECK_PROG(ESTYLE_CONFIG_IN_PATH, $ESTYLE_CONFIG, yes, no)
+ if test $ESTYLE_CONFIG_IN_PATH = no; then
+ echo "ERROR:"
+ echo "The estyle-config development script you specified:"
+ echo "$ESTYLE_CONFIG"
+ echo "was not found. Please check the path and make sure "
+ echo "the script exists and is executable."
+ AC_MSG_ERROR([Fatal Error: no estyle-config detected.])
+ exit;
+ fi
+],
+[
+ AC_CHECK_PROG(ESTYLE_CONFIG_IN_PATH, $ESTYLE_CONFIG, yes, no)
+ if test $ESTYLE_CONFIG_IN_PATH = no; then
+ echo "ERROR:"
+ echo "The estyle-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 estyle-devel (or estyle-dev)"
+ echo " packages."
+ echo "2. You may have estyle 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 estyle-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-estyle-config."
+ AC_MSG_ERROR([Fatal Error: no estyle-config detected.])
+ exit;
+ fi
+])
+
IMLIB2_CONFIG="imlib2-config"
AC_ARG_WITH(imlib2,
[ --with-imlib2-config=FILE imlib2-config script to use (eg /usr/bin/imlib2-config)],
@@ -244,38 +279,23 @@
ewd_cflags=`ewd-config --cflags`
ewd_libs=`ewd-config --libs`
+AC_SUBST(estyle_cflags)
+AC_SUBST(estyle_libs)
+estyle_cflags=`estyle-config --cflags`
+estyle_libs=`estyle-config --libs`
+
AC_SUBST(imlib2_cflags)
AC_SUBST(imlib2_libs)
imlib2_cflags=`imlib2-config --cflags`
imlib2_libs=`imlib2-config --libs`
-
-dnl Checking for Perl:
-AC_PATH_PROG(PERL,perl,0)
-AC_SUBST(PERL)
-
-dnl Look for jade for sgml translations.
-AC_ARG_WITH(dbsheets,
- [ --with-dbsheets=DIR use DIR to specify your DocBook stylesheets installation path.],
- DB_STYLESHEETS="$withval", DB_STYLESHEETS="/usr/lib/sgml/stylesheet/dsssl/docbook/nwalsh")
-AC_SUBST(DB_STYLESHEETS)
-AC_PATH_PROG(JADE, jade)
-AM_CONDITIONAL(HAVE_JADE, test "x$JADE" != "x" && test -d "$DB_STYLESHEETS")
-
-
AC_OUTPUT([
Makefile
etox-config
src/Makefile
-doc/kernel-doc
-doc/html-customizations.dsl
-doc/Makefile
test/Makefile
-test/fnt/Makefile
test/img/Makefile
-test/style/Makefile
], [
chmod +x etox-config
-chmod +x doc/kernel-doc
]
)
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/etox-config.h.in,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -3 -r1.4 -r1.4.2.1
--- etox-config.h.in 27 Dec 2001 15:37:53 -0000 1.4
+++ etox-config.h.in 2 Apr 2002 11:41:37 -0000 1.4.2.1
@@ -1,24 +1,61 @@
-/* etox-config.h.in. Generated automatically from configure.in by autoheader. */
-
-/* Define to empty if the keyword does not work. */
-#undef const
-
-/* Define if you need to in order for stat and other things to work. */
-#undef _POSIX_SOURCE
-
-/* Define if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
+/* etox-config.h.in. Generated from configure.ac by autoheader. */
#undef PACKAGE_DATA_DIR
#undef PACKAGE_LOCALE_DIR
#undef PACKAGE_SOURCE_DIR
-/* Define if you have the <dlfcn.h> header file. */
+/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
/* Name of package */
#undef PACKAGE
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
/* Version number of package */
#undef VERSION
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/etox-config.in,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -3 -r1.1 -r1.1.2.1
--- etox-config.in 17 Aug 2001 12:20:33 -0000 1.1
+++ etox-config.in 2 Apr 2002 11:41:37 -0000 1.1.2.1
@@ -42,11 +42,11 @@
if test @includedir@ != /usr/include ; then
includes=-I@includedir@
fi
- echo $includes @evas_cflags@ @ewd_cflags@ -I$prefix/include/etox
+ echo $includes @evas_cflags@ @ewd_cflags@ @estyle_cflags@ -I$prefix/include/etox
;;
--libs)
libdirs=-L@libdir@
- echo $libdirs -letox @evas_libs@ @ewd_libs@ -lm
+ echo $libdirs -letox @evas_libs@ @ewd_libs@ @estyle_libs@ -lm
;;
*)
echo "${usage}" 1>&2
|