From: <enl...@li...> - 2003-07-30 02:21:48
|
Enlightenment CVS committal Author : mej Project : e16 Module : epplets Dir : e16/epplets Modified Files: ChangeLog acconfig.h configure.in epplets.spec Log Message: Tue Jul 29 22:20:38 EDT 2003 (KainX) Applied patch from Kim Woelders <ki...@wo...> for various build fixes. =================================================================== RCS file: /cvsroot/enlightenment/e16/epplets/ChangeLog,v retrieving revision 1.226 retrieving revision 1.227 diff -u -3 -r1.226 -r1.227 --- ChangeLog 7 Apr 2003 02:40:01 -0000 1.226 +++ ChangeLog 30 Jul 2003 02:21:17 -0000 1.227 @@ -2279,3 +2279,10 @@ Applied patch from Kim Woelders <ki...@wo...> to support new WM hints. ------------------------------------------------------------------------------- + +Tue Jul 29 22:20:38 EDT 2003 +(KainX) + +Applied patch from Kim Woelders <ki...@wo...> for various build fixes. + +------------------------------------------------------------------------------- =================================================================== RCS file: /cvsroot/enlightenment/e16/epplets/acconfig.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- acconfig.h 27 Feb 2000 15:03:36 -0000 1.8 +++ acconfig.h 30 Jul 2003 02:21:17 -0000 1.9 @@ -279,10 +279,6 @@ /* Define if lex declares yytext as a char * by default, not a char[]. */ #undef YYTEXT_POINTER -/* Enlightenment paths */ -#undef EROOT -#undef EBIN - /* Do we need libgtop? */ #undef HAVE_LIBGTOP =================================================================== RCS file: /cvsroot/enlightenment/e16/epplets/configure.in,v retrieving revision 1.36 retrieving revision 1.37 diff -u -3 -r1.36 -r1.37 --- configure.in 5 Jun 2002 01:40:35 -0000 1.36 +++ configure.in 30 Jul 2003 02:21:17 -0000 1.37 @@ -1,4 +1,4 @@ -dnl# $Id: configure.in,v 1.36 2002/06/05 01:40:35 mej Exp $ +dnl# $Id: configure.in,v 1.37 2003/07/30 02:21:17 mej Exp $ AC_INIT(api/epplet.c) AM_INIT_AUTOMAKE(epplets, 0.7) @@ -117,9 +117,9 @@ dnl# AC_CHECK_LIB(GL, glXChooseVisual, GL_LIBS="GL", , $X_LIBS $SUBLIBS) -if test "$GL_LIBS" = "GL"; then - AC_CHECK_LIB(GLU, main, , GL_LIBS="", $X_LIBS $SUBLIBS) -fi +#if test "$GL_LIBS" = "GL"; then +# AC_CHECK_LIB(GLU, main, , GL_LIBS="", $X_LIBS $SUBLIBS) +#fi GL_PROGS="" @@ -227,6 +227,13 @@ GTLIBS="" fi +if test "x$prefix" = "xNONE"; then + prefix=$ac_default_prefix +fi +if test "x$exec_prefix" = "xNONE"; then + exec_prefix=$prefix +fi + # Build test programs? AC_ARG_WITH(test-programs, [ --with-test-programs Builds the test programs [default=no]], TEST_PROGS="EppletTest.epplet EppletConfigTest.epplet",TEST_PROGS="") @@ -275,7 +282,7 @@ AC_SUBST(EROOT) AC_MSG_RESULT($EROOT) else - EROOT=$ENLIGHTENMENT_ROOT + EROOT=`eval echo $ENLIGHTENMENT_ROOT` AC_MSG_RESULT(warning: EROOT environment variable not detected. Using $EROOT) AC_SUBST(EROOT) fi @@ -288,14 +295,10 @@ AC_SUBST(EBIN) AC_MSG_RESULT($EBIN) else - EBIN=$ENLIGHTENMENT_BIN + EBIN=`eval echo $ENLIGHTENMENT_BIN` AC_MSG_RESULT(warning: EBIN environment variable not detected. Using $EBIN) AC_SUBST(EBIN) fi -AC_DEFINE_UNQUOTED(EROOT, "$EROOT") -AC_DEFINE_UNQUOTED(EBIN, "$EBIN") -AC_SUBST(EROOT) -AC_SUBST(EBIN) # Should we install E-Mixer? # Probably not ;-) But we may as well check! @@ -361,17 +364,7 @@ AM_CONFIG_HEADER(config.h) -AC_OUTPUT(Makefile api/Makefile epplets/Makefile debian/Makefile) - -echo "creating api/epplet.h" -sed -e "s%@EROOT@%$EROOT%g" -e "s%@EBIN@%$EBIN%g" -e "s%\${exec_prefix}%${exec_prefix}%g" -e "s%\${prefix}%${prefix}%g" ${srcdir}/api/epplet.h.in > api/epplet.h.new -if (diff api/epplet.h.new api/epplet.h >/dev/null 2>&1); then - echo "api/epplet.h unchanged." - rm -f api/epplet.h.new -else - rm -f api/epplet.h - mv api/epplet.h.new api/epplet.h -fi +AC_OUTPUT(Makefile api/Makefile epplets/Makefile debian/Makefile api/epplet.h) echo echo "If you are running Enlightenment < 0.16.4, you *must* configure" =================================================================== RCS file: /cvsroot/enlightenment/e16/epplets/epplets.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- epplets.spec 7 Apr 2003 02:40:01 -0000 1.5 +++ epplets.spec 30 Jul 2003 02:21:17 -0000 1.6 @@ -3,7 +3,7 @@ Summary: Enlightenment Epplets Name: epplets Version: 0.7 -Release: 0.3 +Release: 0.4 Copyright: BSD Group: User Interface/X URL: http://www.enlightenment.org |