Enlightenment CVS committal Author : essiene Project : e17 Module : proto
Dir : e17/proto/entrance_edit_gui Modified Files: configure.in Log Message: We now make use of the spanking new entrance_edit-config script in entrance. Booya! Bye-bye build problems. =================================================================== RCS file: /cvs/e/e17/proto/entrance_edit_gui/configure.in,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- configure.in 13 Aug 2006 13:46:45 -0000 1.8 +++ configure.in 13 Aug 2006 23:55:55 -0000 1.9 @@ -85,22 +85,22 @@ #packagesrcdir=`cd $srcdir && pwd` #AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [Source Code Directory]) -#check for ENTRANCE which contains libentrance_edit -#AC_PATH_EFL( -# entrance, -# 0.1.0.001, -# [ -# AC_DEFINE(HAVE_ENTRANCE, 1, have ENTRANCE) -# entrance="ENTRANCE " -# AM_CONDITIONAL(HAVE_ENTRANCE, true) -# have_entrance="yes" -# entrance_libs=-lentrance_edit -# entrance_cflags=/usr/include/ -# ], -# [ -# AC_MSG_ERROR([No Entrance, entrance_edit_gui is an entrance utility. Install entrance first]) -# ] -#) +#check for ENTRANCE_EDIT which contains libentrance_edit +AC_PATH_EFL( + entrance_edit, + 0.1.0.001, + [ + AC_DEFINE(HAVE_ENTRANCE_EDIT, 1, have ENTRANCE_EDIT) + entrance_edit="ENTRANCE_EDIT " + AM_CONDITIONAL(HAVE_ENTRANCE_EDIT, true) + have_entrance_edit="yes" + entrance_edit_libs=`entrance_edit-config --libs` + entrance_edit_cflags=`entrance_edit-config --cflags` + ], + [ + AC_MSG_ERROR([No Entrance, entrance_edit_gui is an entrance utility. Install entrance first]) + ] +) #check for ETK AC_PATH_EFL( @@ -119,11 +119,8 @@ ] ) -entrance_libs=-lentrance_edit -entrance_cflags=-I/usr/include/ - -AC_SUBST(entrance_libs) -AC_SUBST(entrance_cflags) +AC_SUBST(entrance_edit_libs) +AC_SUBST(entrance_edit_cflags) AC_SUBST(etk_libs) AC_SUBST(etk_cflags) ------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs