Enlightenment CVS committal
Author : xcomputerman
Project : e17
Module : libs/etox
Dir : e17/libs/etox
Modified Files:
configure.in etox-config.in
Log Message:
Estyle is now part of Etox. Update yer proggies!
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/configure.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- configure.in 24 Mar 2004 05:19:03 -0000 1.17
+++ configure.in 6 May 2004 05:17:51 -0000 1.18
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(etox, 0.0.2)
+AM_INIT_AUTOMAKE(etox, 0.9.0)
AM_CONFIG_HEADER(config.h)
AC_ISC_POSIX
@@ -114,41 +114,6 @@
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
-])
-
AC_SUBST(edb_cflags)
AC_SUBST(edb_libs)
edb_cflags=`edb-config --cflags`
@@ -164,15 +129,11 @@
evas_cflags=`evas-config --cflags`
evas_libs=`evas-config --libs`
-AC_SUBST(estyle_cflags)
-AC_SUBST(estyle_libs)
-estyle_cflags=`estyle-config --cflags`
-estyle_libs=`estyle-config --libs`
-
AC_OUTPUT([
Makefile
etox-config
src/Makefile
+src/style/Makefile
test/Makefile
], [
chmod +x etox-config
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/etox/etox-config.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- etox-config.in 24 Mar 2004 05:19:03 -0000 1.3
+++ etox-config.in 6 May 2004 05:17:51 -0000 1.4
@@ -42,11 +42,11 @@
if test @includedir@ != /usr/include ; then
[EMAIL PROTECTED]@
fi
- echo $includes @evas_cflags@ @estyle_cflags@ -I$prefix/include/etox
+ echo $includes @evas_cflags@ -I$prefix/include/etox
;;
--libs)
[EMAIL PROTECTED]@
- echo $libdirs -letox @evas_libs@ @estyle_libs@ -lm
+ echo $libdirs -letox @evas_libs@ -lm
;;
*)
echo "${usage}" 1>&2
-------------------------------------------------------
This SF.Net email is sponsored by Sleepycat Software
Learn developer strategies Cisco, Motorola, Ericsson & Lucent use to
deliver higher performing products faster, at low TCO.
http://www.sleepycat.com/telcomwpreg.php?From=osdnemail3
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
