From: <enl...@so...> - 2001-01-25 21:56:09
|
Enlightenment CVS committal Author : raster Project : e17 Module : libs/evas Dir : e17/libs/evas Modified Files: Makefile.am configure.in evas-config.in Added Files: evas.m4 Log Message: evas.m4 =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- Makefile.am 2000/11/26 17:21:17 1.5 +++ Makefile.am 2001/01/25 21:56:04 1.6 @@ -13,4 +13,7 @@ bin_SCRIPTS = evas-config -EXTRA_DIST = README AUTHORS COPYING evas.spec +EXTRA_DIST = README AUTHORS COPYING evas.spec evas.m4 + +m4datadir = $(datadir)/aclocal +m4data_DATA = evas.m4 =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas/configure.in,v retrieving revision 1.23 retrieving revision 1.24 diff -u -3 -r1.23 -r1.24 --- configure.in 2001/01/14 11:07:01 1.23 +++ configure.in 2001/01/25 21:56:04 1.24 @@ -41,7 +41,7 @@ x_cflags="$X_CFLAGS" x_ldflags="$X_LDFLAGS" -x_libs="$X_LIBS $X_EXTRA_LIBS" +x_libs="$X_LIBS $X_EXTRA_LIBS -lX11" AC_CHECK_LIB(X11, XOpenDisplay, x_libs="$x_libs", AC_MSG_ERROR([ERROR: libX11 not found.]); exit, @@ -55,6 +55,8 @@ AC_CHECK_LIB(Xext, XShapeCombineMask, x_libs="-lXext $x_libs", AC_MSG_ERROR([ERROR: XShape not found.]); exit, $x_libs) +x_libs="$x_libs -lX11" + #AC_CHECK_LIB(Xrender, XRenderCreatePicture, # [ x_libs=" -lXrender -lXext $x_libs"; # AC_DEFINE(HAVE_RENDER) =================================================================== RCS file: /cvsroot/enlightenment/e17/libs/evas/evas-config.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- evas-config.in 2000/08/22 21:25:52 1.4 +++ evas-config.in 2001/01/25 21:56:04 1.5 @@ -46,7 +46,7 @@ ;; --libs) libdirs=-L@libdir@ - echo $libdirs -levas @gl_ldflags@ @gl_libs@ @LDFLAGS@ @X_LIBS@ @X_PRE_LIBS@ @X_EXTRA_LIBS@ @imlib2_libs@ + echo $libdirs -levas @gl_ldflags@ @gl_libs@ @LDFLAGS@ @x_libs@ @x_ldflags@ @imlib2_libs@ ;; *) echo "${usage}" 1>&2 |