From: <enl...@li...> - 2001-08-31 13:51:05
|
Enlightenment CVS committal Author : boris Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: acconfig.h config.h.in configure.ac configure.in Log Message: no need for ferite. fun. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/acconfig.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- acconfig.h 2001/07/30 16:59:37 1.3 +++ acconfig.h 2001/08/31 13:10:26 1.4 @@ -13,3 +13,4 @@ #undef PACKAGE_SOURCE_DIR #undef PACKAGE_BIN_DIR #undef PACKAGE_LIB_DIR +#undef USE_FERITE =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/config.h.in,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- config.h.in 2001/08/24 09:16:30 1.6 +++ config.h.in 2001/08/31 13:10:26 1.7 @@ -14,6 +14,7 @@ #undef PACKAGE_SOURCE_DIR #undef PACKAGE_BIN_DIR #undef PACKAGE_LIB_DIR +#undef USE_FERITE /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP systems. This function is required for `alloca.c' support on those systems. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/configure.ac,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- configure.ac 2001/08/25 20:02:06 1.3 +++ configure.ac 2001/08/31 13:10:26 1.4 @@ -163,13 +163,17 @@ AC_PATH_GENERIC(ferite,, [ AC_SUBST(ferite_libs) - AC_SUBST(ferite_cflags)], - AC_MSG_ERROR(Cannot find ferite: Is ferite-config in path? ferite can be obtained from http://www.ferite.org)) -ferite_libs=`ferite-config --libs` -ferite_cflags=`ferite-config --cflags` - -AC_PATH_PROG(FEBUILDER, builder,,) -AC_SUBST(FEBUILDER) + AC_SUBST(ferite_cflags) + AC_DEFINE(USE_FERITE) + ferite_libs=`ferite-config --libs` + ferite_cflags=`ferite-config --cflags` + AC_PATH_PROG(FEBUILDER, builder,,) + AC_SUBST(FEBUILDER) + ferite=yes],[ + echo "Not building ferite support" + ferite=no]) + +AM_CONDITIONAL(USE_FERITE, test "x$ferite" = "xyes") AC_SUBST(CP_OPTIONS) =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/configure.in,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- configure.in 2001/08/25 20:02:06 1.17 +++ configure.in 2001/08/31 13:10:26 1.18 @@ -162,13 +162,17 @@ AC_PATH_GENERIC(ferite,, [ AC_SUBST(ferite_libs) - AC_SUBST(ferite_cflags)], - AC_MSG_ERROR(Cannot find ferite: Is ferite-config in path? ferite can be obtained from http://www.ferite.org)) -ferite_libs=`ferite-config --libs` -ferite_cflags=`ferite-config --cflags` - -AC_PATH_PROG(FEBUILDER, builder,,) -AC_SUBST(FEBUILDER) + AC_SUBST(ferite_cflags) + AC_DEFINE(USE_FERITE) + ferite_libs=`ferite-config --libs` + ferite_cflags=`ferite-config --cflags` + AC_PATH_PROG(FEBUILDER, builder,,) + AC_SUBST(FEBUILDER) + ferite=yes],[ + echo "Not building ferite support" + ferite=no]) + +AM_CONDITIONAL(USE_FERITE, test "x$ferite" = "xyes") AC_SUBST(CP_OPTIONS) |