Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/estyle
Dir : e17/libs/estyle
Modified Files:
Makefile.am configure.in estyle-config.in
Log Message:
Move the ewd dependant code to the ecore equivalents.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- Makefile.am 26 Jan 2002 15:09:04 -0000 1.2
+++ Makefile.am 24 Mar 2004 04:53:49 -0000 1.3
@@ -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,12 +26,3 @@
m4datadir = $(datadir)/aclocal
m4data_DATA = estyle.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/estyle/configure.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- configure.in 15 Jan 2004 01:24:50 -0000 1.7
+++ configure.in 24 Mar 2004 04:53:49 -0000 1.8
@@ -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
-])
-
IMLIB2_CONFIG="imlib2-config"
AC_ARG_WITH(imlib2,
[ --with-imlib2-config=FILE imlib2-config script to use (eg
/usr/bin/imlib2-config)],
@@ -199,36 +164,13 @@
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(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
-doc/kernel-doc
-doc/html-customizations.dsl
-doc/Makefile
estyle-config
src/Makefile
test/Makefile
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/estyle/estyle-config.in,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -3 -r1.1.1.1 -r1.2
--- estyle-config.in 26 Jan 2002 07:37:08 -0000 1.1.1.1
+++ estyle-config.in 24 Mar 2004 04:53:49 -0000 1.2
@@ -42,11 +42,11 @@
if test @includedir@ != /usr/include ; then
[EMAIL PROTECTED]@
fi
- echo $includes @evas_cflags@ @ewd_cflags@ -I$prefix/include/estyle
+ echo $includes @evas_cflags@ -I$prefix/include/estyle
;;
--libs)
[EMAIL PROTECTED]@
- echo $libdirs -lestyle @evas_libs@ @ewd_libs@ -lm
+ echo $libdirs -lestyle @evas_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
