Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/etox
Dir : e17/libs/etox
Modified Files:
Makefile.am configure.in etox-config.in
Log Message:
Remove ewd dependancy.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- Makefile.am 1 Jan 2002 14:29:22 -0000 1.7
+++ Makefile.am 24 Mar 2004 05:19:03 -0000 1.8
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = src test doc
+SUBDIRS = src test
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
config.h.in config.sub configure install-sh \
@@ -26,10 +26,3 @@
m4datadir = $(datadir)/aclocal
m4data_DATA = etox.m4
-docs:
- $(MAKE) -C $(top_srcdir)/doc docs
-
-if HAVE_JADE
-html-docs:
- $(MAKE) -C $(top_srcdir)/doc html-docs
-endif
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/configure.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- configure.in 16 Mar 2004 17:27:25 -0000 1.16
+++ configure.in 24 Mar 2004 05:19:03 -0000 1.17
@@ -114,41 +114,6 @@
fi
])
-EWD_CONFIG="ewd-config"
-AC_ARG_WITH(ewd,
-[ --with-ewd-config=FILE ewd-config script to use (eg /usr/bin/ewd-config)],
-[
- EWD_CONFIG=$withval
- AC_CHECK_PROG(EWD_CONFIG_IN_PATH, $EWD_CONFIG, yes, no)
- if test $EWD_CONFIG_IN_PATH = no; then
- echo "ERROR:"
- echo "The ewd-config development script you specified:"
- echo "$EWD_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 ewd-config detected.])
- exit;
- fi
-],
-[
- AC_CHECK_PROG(EWD_CONFIG_IN_PATH, $EWD_CONFIG, yes, no)
- if test $EWD_CONFIG_IN_PATH = no; then
- echo "ERROR:"
- echo "The ewd-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 ewd-devel (or ewd-dev)"
- echo " packages."
- echo "2. You may have ewd 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 ewd-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-ewd-config."
- AC_MSG_ERROR([Fatal Error: no ewd-config detected.])
- exit;
- fi
-])
-
ESTYLE_CONFIG="estyle-config"
AC_ARG_WITH(estyle,
[ --with-estyle-config=FILE estyle-config script to use (eg
/usr/bin/estyle-config)],
@@ -199,30 +164,16 @@
evas_cflags=`evas-config --cflags`
evas_libs=`evas-config --libs`
-AC_SUBST(ewd_cflags)
-AC_SUBST(ewd_libs)
-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`
-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/stylesheets/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
test/Makefile
-doc/Makefile
], [
chmod +x etox-config
]
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/etox-config.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etox-config.in 2 Apr 2002 02:50:09 -0000 1.2
+++ etox-config.in 24 Mar 2004 05:19:03 -0000 1.3
@@ -42,11 +42,11 @@
if test @includedir@ != /usr/include ; then
[EMAIL PROTECTED]@
fi
- echo $includes @evas_cflags@ @ewd_cflags@ @estyle_cflags@ -I$prefix/include/etox
+ echo $includes @evas_cflags@ @estyle_cflags@ -I$prefix/include/etox
;;
--libs)
[EMAIL PROTECTED]@
- echo $libdirs -letox @evas_libs@ @ewd_libs@ @estyle_libs@ -lm
+ echo $libdirs -letox @evas_libs@ @estyle_libs@ -lm
;;
*)
echo "${usage}" 1>&2
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
