Enlightenment CVS committal

Author  : rbdpngn
Project : e17
Module  : libs/ebg

Dir     : e17/libs/ebg


Modified Files:
        Makefile.am README configure.in 


Log Message:
More merging spam.

===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ebg/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- Makefile.am 4 Sep 2002 18:48:42 -0000       1.6
+++ Makefile.am 14 Jan 2003 22:47:41 -0000      1.7
@@ -1,10 +1,11 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = src test doc tools
+SUBDIRS = src test doc
+#SUBDIRS = src test doc tools
 
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess ebg-config.h.in \
                        config.sub configure install-sh ltconfig ltmain.sh \
-                       missing mkinstalldirs stamp-h.in config.h.in
+                       missing mkinstalldirs stamp-h.in config.h.in depcomp
 
 bin_SCRIPTS = ebg-config
 
@@ -16,3 +17,5 @@
 html-docs:
        $(MAKE) -C $(top_srcdir)/doc html-docs
 endif
+
+EXTRA_DIST = README AUTHORS COPYING ebg.spec
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ebg/README,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- README      4 Sep 2002 18:48:42 -0000       1.4
+++ README      14 Jan 2003 22:47:41 -0000      1.5
@@ -0,0 +1,2 @@
+This REQUIRES Evas2, not 1.  Which means it won't work for lots of people,
+sorry.  
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ebg/configure.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- configure.in        4 Sep 2002 18:48:42 -0000       1.7
+++ configure.in        14 Jan 2003 22:47:41 -0000      1.8
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(ebg, 0.1.1)
+AM_INIT_AUTOMAKE(ebg, 1.0.0)
 AM_CONFIG_HEADER(src/ebg-config.h)
 
 AC_ISC_POSIX
@@ -58,6 +58,20 @@
 ecore_libs=`ecore-config --libs`
 ecore_cflags=`ecore-config --cflags`
 
+AC_ARG_WITH(imlib2,
+        [  --with-imlib2=DIR       use imlib2 in <DIR>],
+        [CFLAGS="$CFLAGS -I$withval/include"
+        LIBS="-L$withval/lib $LIBS"])
+
+AC_PATH_GENERIC(imlib2, 1.0.0, [
+  AC_SUBST(imlib_libs)
+  AC_SUBST(imlib_cflags) ],
+  AC_MSG_ERROR(Cannot find imlib2: Is imlib2-config in the path?) )
+imlib_libs=`imlib2-config --libs`
+imlib_cflags=`imlib2-config --cflags`
+AC_SUBST(imlib_libs)
+AC_SUBST(imlib_cflags)
+
 AC_PATH_PROG(PERL, perl, 0)
 AC_SUBST(PERL)
 
@@ -82,3 +96,4 @@
 chmod +x doc/kernel-doc
 ]
 )
+




-------------------------------------------------------
This SF.NET email is sponsored by: Take your first step towards giving 
your online business a competitive advantage. Test-drive a Thawte SSL 
certificate - our easy online guide will show you how. Click here to get 
started: http://ads.sourceforge.net/cgi-bin/redirect.pl?thaw0027en
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to