Enlightenment CVS committal
Author : kwo
Project : e16
Module : epplets
Dir : e16/epplets
Modified Files:
configure.in epplets.spec
Removed Files:
acconfig.h
Log Message:
Move to Imlib2. Build for e16.8.
- This is a quick and dirty port to imlib2. It's posible to clean/speed up
things considerably here and there.
- It's not unlikely that I missed some spots that require fixups.
===================================================================
RCS file: /cvs/e/e16/epplets/configure.in,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -3 -r1.39 -r1.40
--- configure.in 11 Feb 2005 04:29:17 -0000 1.39
+++ configure.in 31 Mar 2006 22:56:17 -0000 1.40
@@ -1,7 +1,7 @@
-dnl# $Id: configure.in,v 1.39 2005/02/11 04:29:17 mej Exp $
+dnl# $Id: configure.in,v 1.40 2006/03/31 22:56:17 kwo Exp $
AC_INIT(api/epplet.c)
-AM_INIT_AUTOMAKE(epplets, 0.8)
+AM_INIT_AUTOMAKE(epplets, 0.9)
dnl# Supply default CFLAGS, if not specified by `CFLAGS=flags ./configure'
if test ! -z "${CFLAGS}" -o ! -z "${CCOPTS}"; then
@@ -28,7 +28,6 @@
dnl# At least make the attempt to support CygWin32
AC_CYGWIN
-AC_ARG_PROGRAM
AM_PROG_LIBTOOL
@@ -127,7 +126,7 @@
AC_CHECK_HEADERS(GL/glx.h,[P_GL="GL"], [echo "Warning Will Robinson. No
OpenGL headers! Install Mesa our your favorite hardware GLX."])
if test "$P_GL" = "GL"; then
X_LIBS="-lGL -lGLU $X_LIBS"
- AC_DEFINE(HAVE_LIBGL)
+ AC_DEFINE(HAVE_LIBGL, 1, [Have OpenGL])
GL_PROGS="E-OpenGL-Demo.epplet"
AC_MSG_WARN([*** Building for GLX. Grab your ankles and kiss your ass
goodbye! ***])
fi
@@ -135,21 +134,21 @@
AC_MSG_WARN(Warning Will Robinson. No OpenGL! Install Mesa or you favorite
hardware GLX.)
fi
-AC_CHECK_PROG(IMLIB_CONFIG, imlib-config, imlib-config, no)
+AC_CHECK_PROG(IMLIB_CONFIG, imlib2-config, imlib2-config, no)
if test "$IMLIB_CONFIG" != "no"; then
if test "$prefix" = "NONE"; then
- AC_MSG_CHECKING(imlib-config for prefix)
+ AC_MSG_CHECKING(imlib2-config for prefix)
prefix="`$IMLIB_CONFIG --prefix`"
AC_MSG_RESULT($prefix)
fi
- AC_MSG_CHECKING(imlib-config for the value of CFLAGS)
+ AC_MSG_CHECKING(imlib2-config for the value of CFLAGS)
CFLAGS="$CFLAGS `$IMLIB_CONFIG --cflags`"
AC_MSG_RESULT($CFLAGS)
- AC_MSG_CHECKING(imlib-config for the value of GRLIBS)
+ AC_MSG_CHECKING(imlib2-config for the value of GRLIBS)
GRLIBS="$GRLIBS `$IMLIB_CONFIG --libs`"
AC_MSG_RESULT($GRLIBS)
@@ -178,7 +177,7 @@
$SUBLIBS $X_LIBS)
AC_CHECK_LIB(ungif, DGifOpenFileName, GRLIBS="$GRLIBS -lungif", ,
$SUBLIBS $X_LIBS)
- AC_CHECK_LIB(Imlib, Imlib_init, , [
+ AC_CHECK_LIB(Imlib2, imlib_create_image, , [
echo "WARNING: Imlib was not found or did not correctly link.";
echo " Please check config.log to see what the error
was.";
echo " I will attempt to continue, but things may go
wrong.";
@@ -206,7 +205,7 @@
AC_MSG_CHECKING(libgtop-config for the value of CFLAGS)
CFLAGS="$CFLAGS $LIBGTOP_INCS"
- AC_DEFINE(HAVE_LIBGTOP)
+ AC_DEFINE(HAVE_LIBGTOP, 1, [Have libgtop])
AC_MSG_RESULT($CFLAGS)
AC_MSG_CHECKING(libgtop-config for the value of LIBS)
@@ -241,15 +240,15 @@
# ok enlightenment d00ds want to ignore civilization and install
# everything in one place. The rest of use prefer sanity.
#
-AC_ARG_ENABLE(fsstd, [ --enable-fsstd install files following FSSTD
[default=no]], ,enable_fsstd=no)
+AC_ARG_ENABLE(fsstd, [ --enable-fsstd install files following FSSTD
[default=yes]], ,enable_fsstd=yes)
if test "x$enable_fsstd" = "xyes"; then
- ENLIGHTENMENT_ROOT=${datadir}/enlightenment
+ ENLIGHTENMENT_ROOT=${datadir}/e16
ENLIGHTENMENT_BIN=${bindir}
USE_FSSTD=yes
else
- ENLIGHTENMENT_ROOT=${prefix}/enlightenment
- ENLIGHTENMENT_BIN=${prefix}/enlightenment/bin
+ ENLIGHTENMENT_ROOT=${prefix}/e16
+ ENLIGHTENMENT_BIN=${prefix}/e16/bin
USE_FSSTD=no
fi
@@ -258,7 +257,7 @@
epplets through e by default [default=no]],
no_respawn=yes,)
if test ! -z "$no_respawn"; then
-AC_DEFINE(NO_AUTO_RESPAWN)
+AC_DEFINE(NO_AUTO_RESPAWN, 1, [Disable auto-respawning])
fi
AC_ARG_ENABLE(new-remember,
@@ -267,38 +266,38 @@
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
- AC_DEFINE(NEW_REMEMBER)
+ AC_DEFINE(NEW_REMEMBER, 1, [Disable new remember (obsolete)])
fi,
AC_MSG_RESULT(no)
)
-# If $EROOT is set use it, unless a make distcheck is being done
-# Makes the gratuitous assumption that "=inst" is neccessary and
-# sufficuent for a make distcheck
-AC_MSG_CHECKING(for Enlightenment location)
-if test -n "$EROOT" -a `echo "$prefix" | sed -e 's:=inst::'` = "$prefix"
-then
- AC_SUBST(EROOT)
- AC_MSG_RESULT($EROOT)
-else
+## If $EROOT is set use it, unless a make distcheck is being done
+## Makes the gratuitous assumption that "=inst" is neccessary and
+## sufficuent for a make distcheck
+#AC_MSG_CHECKING(for Enlightenment location)
+#if test -n "$EROOT" -a `echo "$prefix" | sed -e 's:[=_]inst::'` = "$prefix"
+#then
+# AC_SUBST(EROOT)
+# AC_MSG_RESULT($EROOT)
+#else
EROOT=`eval echo $ENLIGHTENMENT_ROOT`
- AC_MSG_RESULT(warning: EROOT environment variable not detected. Using
$EROOT)
+# AC_MSG_RESULT(warning: EROOT environment variable not detected. Using
$EROOT)
AC_SUBST(EROOT)
-fi
+#fi
# If $EBIN is set use it, unless a make distcheck is being done
# Makes the gratuitous assumption that "=inst" is neccessary and
# sufficuent for a make distcheck
-AC_MSG_CHECKING(for Enlightenment binary location)
-if test -n "$EBIN" -a `echo "$prefix" | sed -e 's:=inst::'` = "$prefix"
-then
- AC_SUBST(EBIN)
- AC_MSG_RESULT($EBIN)
-else
+#AC_MSG_CHECKING(for Enlightenment binary location)
+#if test -n "$EBIN" -a `echo "$prefix" | sed -e 's:[=_]inst::'` = "$prefix"
+#then
+# AC_SUBST(EBIN)
+# AC_MSG_RESULT($EBIN)
+#else
EBIN=`eval echo $ENLIGHTENMENT_BIN`
- AC_MSG_RESULT(warning: EBIN environment variable not detected. Using $EBIN)
+# AC_MSG_RESULT(warning: EBIN environment variable not detected. Using
$EBIN)
AC_SUBST(EBIN)
-fi
+#fi
# Should we install E-Mixer?
# Probably not ;-) But we may as well check!
@@ -334,12 +333,12 @@
AC_PATH_PROG(MOUNT, mount)
AC_PATH_PROG(UMOUNT, umount)
AC_PATH_PROG(EJECT, eject)
-AC_DEFINE_UNQUOTED(MOUNT, "$MOUNT")
-AC_DEFINE_UNQUOTED(UMOUNT, "$UMOUNT")
-AC_DEFINE_UNQUOTED(EJECT, "$EJECT")
+AC_DEFINE_UNQUOTED(MOUNT, "$MOUNT", [Location of mount])
+AC_DEFINE_UNQUOTED(UMOUNT, "$UMOUNT", [Location of umount])
+AC_DEFINE_UNQUOTED(EJECT, "$EJECT", [Location of eject])
if test -n "$EJECT"; then
- AC_DEFINE(HAVE_EJECT, 1)
+ AC_DEFINE(HAVE_EJECT, 1, [Have eject])
fi
CFLAGS=${CFLAGS--O}
===================================================================
RCS file: /cvs/e/e16/epplets/epplets.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- epplets.spec 11 Feb 2005 04:29:17 -0000 1.13
+++ epplets.spec 31 Mar 2006 22:56:17 -0000 1.14
@@ -2,7 +2,7 @@
Summary: Enlightenment Epplets
Name: epplets
-Version: 0.8
+Version: 0.9
Release: 0.%(date '+%Y%m%d')
License: BSD
Group: User Interface/X
@@ -13,7 +13,7 @@
Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
#BuildSuggests: freeglut-devel xorg-x11-devel
BuildRequires: imlib-devel XFree86-devel
-Requires: enlightenment >= 0.16.0
+#Requires: enlightenment >= 0.16.0
Provides: enlightenment-epplets = %{version}
Provides: e16-epplets = %{version}
Obsoletes: enlightenment-epplets
@@ -61,7 +61,7 @@
%{_includedir}/*
%{_libdir}/*
%{_bindir}/*
-%{_datadir}/enlightenment/epplet_icons/*
-%{_datadir}/enlightenment/epplet_data/*
+%{_datadir}/e16/epplet_icons/*
+%{_datadir}/e16/epplet_data/*
%changelog
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
