Fri Aug 10 13:33:13 PDT 2001

(KainX)

None of the libraries are now absolute requirements.  Everything that
requires external support which Imlib2 itself doesn't specifically
need can now be optionally built.


SVN revision: 5090
This commit is contained in:
Michael Jennings 2001-08-10 20:34:33 +00:00
parent f5a26225a1
commit 64cbfee4fe
3 changed files with 36 additions and 50 deletions

View File

@ -2932,3 +2932,12 @@ It's generally a good idea to increment the reference count when you
implement reference counting. This should fix the mysterious problems
people have been having with Imlib2 stealing pixmaps out from under
Eterm.
_______________________________________________
Fri Aug 10 13:33:13 PDT 2001
(KainX)
None of the libraries are now absolute requirements. Everything that
requires external support which Imlib2 itself doesn't specifically
need can now be optionally built.

View File

@ -7,9 +7,15 @@ AM_INIT_AUTOMAKE(imlib2, 1.0.4)
AM_CONFIG_HEADER(config.h)
AC_ARG_WITH(edb,
[ --with-edb=DIR use edb rooted at <DIR>],
[CPPFLAGS="$CPPFLAGS -I$withval/include"
LIBS="-L$withval/lib $LIBS"])
[ --with-edb=DIR use edb rooted at <DIR>],
if test "$withval" = "yes"; then
:
elif test "$withval" = "no"; then
edb_ok=no
else
CPPFLAGS="$CPPFLAGS -I$withval/include"
LIBS="-L$withval/lib $LIBS"
fi)
AC_ARG_WITH(freetype,
[ --with-freetype=DIR use freetype rooted at <DIR>],
@ -209,10 +215,14 @@ if test "$png_ok" = yes; then
fi
# Test for libedb
AC_CHECK_LIB(edb, e_db_open,
edb_ok=yes,
edb_ok=no
AC_MSG_WARN(*** Native EDB support will not be built (EDB library not found) ***), $EXTRA_LIBS -lz)
if test "x$edb_ok" != "xno"; then
AC_CHECK_LIB(edb, e_db_open,
edb_ok=yes,
edb_ok=no
AC_MSG_WARN(*** Native EDB support will not be built (EDB library not found) ***), $EXTRA_LIBS -lz)
else
AC_MSG_WARN(*** Native EDB support will not be built (deactivated by user) ***)
fi
if test "$edb_ok" = yes; then
AC_MSG_CHECKING([for Edb.h])
AC_TRY_CPP(
@ -309,28 +319,6 @@ if test "$gif_ok" = no; then
fi
fi
if test "$jpeg_ok" = no; then
AC_MSG_ERROR([
Fatal Error: No JPEG Headers AND Library detected.
This is a minimum requirement
(at least a JPEG, PNG and DB loader need to be built)
All other loaders are optional])
fi
if test "$png_ok" = no; then
AC_MSG_ERROR([
Fatal Error: No PNG Headers AND Library detected.
This is a minimum requirement
(at least a JPEG, PNG and DB loader need to be built)
All other loaders are optional])
fi
if test "$edb_ok" = no; then
AC_MSG_ERROR([
Fatal Error: No EDB Headers AND Library detected.
This is a minimum requirement
(at least a JPEG, PNG and DB loader need to be built)
All other loaders are optional])
fi
AM_CONDITIONAL(JPEG_LOADER, test "$jpeg_ok" = yes)
AM_CONDITIONAL(PNG_LOADER, test "$png_ok" = yes)
AM_CONDITIONAL(EDB_LOADER, test "$edb_ok" = yes)

View File

@ -1,31 +1,21 @@
%define name imlib2
%define ver @VERSION@
%define rel 1
%define prefix /usr
Summary: Powerful image loading and rendering library
Name: %{name}
Version: %{ver}
Release: %{rel}
Name: imlib2
Version: @VERSION@
Release: 1
Copyright: BSD
Group: System/Libraries
Source: ftp://ftp.enlightenment.org/pub/enlightenment/e17/libs/%{name}-%{ver}.tar.gz
Group: System Environment/Libraries
Source: ftp://ftp.enlightenment.org/pub/enlightenment/e17/libs/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-root
Packager: Lyle Kempler <term@kempler.net>, Joakim Bodin <bodin@dreamhosted.com>
URL: http://www.rasterman.com/raster/imlib.html
#Requires: freetype >= 1.2
#Requires: freetype < 2.0
Requires: freetype
Requires: XFree86
Requires: imlib2-loader_jpeg
Requires: imlib2-loader_png
Requires: imlib2-loader_db
Requires: imlib2-loader_argb
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: edb-devel >= 1.0.2
BuildRequires: XFree86-devel
#BuildRequires: freetype-devel >= 1.2
#BuildRequires: freetype-devel < 2.0
BuildRequires: freetype-devel
%description
Imlib2 is an advanced replacement library for libraries like libXpm that
provides many more features with much greater flexibility and speed than
@ -127,14 +117,13 @@ rm -rf $RPM_BUILD_ROOT
if [ -f configure ]
then
%configure
#./configure --prefix=%prefix
%configure --prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} --includedir=%{_includedir}
else
# can't build as root? gah. ;)
sed <autogen.sh 's@$USER@ANNOYING@' >autogen.sh1
mv -f autogen.sh1 autogen.sh
chmod 0700 autogen.sh
./autogen.sh --prefix=%prefix
./autogen.sh --prefix=%{_prefix} --bindir=%{_bindir} --libdir=%{_libdir} --includedir=%{_includedir}
fi
if [ "$SMP" != "" ]; then