Commit 2bc31222 authored by Alessandro Ghedini's avatar Alessandro Ghedini

Imported Upstream version 1.2.1

parent 0d02929f
## Process this file with automake to produce Makefile.in
SUBDIRS = src data doc debian
SUBDIRS = src data doc
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
config.h.in config.sub configure install-sh \
ltconfig ltmain.sh missing mkinstalldirs \
stamp-h.in imlib2_docs.tar imlib2_docs.tar.gz imlib2.c
dist-hook:
./gendoc; \
tar cvf imlib2_docs.tar doc; \
rm -f imlib2_docs.tar.gz; \
gzip -9 imlib2_docs.tar;
stamp-h.in build-stamp configure-stamp depcomp \
imlib2_docs.tar.gz imlib2.c \
README \
imlib2.pc \
imlib2.spec \
imlib2.oe imlib2-native.oe \
imlib2.bb imlib2Xnative.bb \
debian/changelog
bin_SCRIPTS = imlib2-config
EXTRA_DIST = README AUTHORS COPYING COPYING-PLAIN TODO imlib2.spec imlib2.c.in imlib2.pc.in gendoc Doxyfile imlib2_docs.tar.gz
EXTRA_DIST = AUTHORS COPYING COPYING-PLAIN gendoc \
Doxyfile \
README.in README \
imlib2.pc.in \
imlib2.spec.in imlib2.spec \
imlib2.oe.in imlib2.oe imlib2-native.oe.in imlib2-native.oe \
imlib2.bb.in imlib2.bb imlib2Xnative.bb.in imlib2Xnative.bb \
debian/changelog.in debian/changelog \
debian/control \
debian/copyright \
debian/imlib2-config.1 \
debian/imlib2-demo.install \
debian/imlib2-test.install \
debian/libimlib2-dev.doc-base \
debian/libimlib2-dev.install \
debian/libimlib2.install \
debian/rules
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = imlib2.pc
......@@ -93,30 +93,35 @@ VERSION = @VERSION@
ZLIBLIBS = @ZLIBLIBS@
my_includes = @my_includes@
my_libs = @my_libs@
requirements = @requirements@
SUBDIRS = src data doc debian
SUBDIRS = src data doc
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in config.sub configure install-sh ltconfig ltmain.sh missing mkinstalldirs stamp-h.in imlib2_docs.tar imlib2_docs.tar.gz imlib2.c
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in config.sub configure install-sh ltconfig ltmain.sh missing mkinstalldirs stamp-h.in build-stamp configure-stamp depcomp imlib2_docs.tar.gz imlib2.c README imlib2.pc imlib2.spec imlib2.oe imlib2-native.oe imlib2.bb imlib2Xnative.bb debian/changelog
bin_SCRIPTS = imlib2-config
EXTRA_DIST = README AUTHORS COPYING COPYING-PLAIN TODO imlib2.spec imlib2.c.in imlib2.pc.in gendoc Doxyfile imlib2_docs.tar.gz
EXTRA_DIST = AUTHORS COPYING COPYING-PLAIN gendoc Doxyfile README.in README imlib2.pc.in imlib2.spec.in imlib2.spec imlib2.oe.in imlib2.oe imlib2-native.oe.in imlib2-native.oe imlib2.bb.in imlib2.bb imlib2Xnative.bb.in imlib2Xnative.bb debian/changelog.in debian/changelog debian/control debian/copyright debian/imlib2-config.1 debian/imlib2-demo.install debian/imlib2-test.install debian/libimlib2-dev.doc-base debian/libimlib2-dev.install debian/libimlib2.install debian/rules
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = imlib2.pc
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES = imlib2-config imlib2.pc
CONFIG_CLEAN_FILES = imlib2.pc imlib2-config README imlib2.spec \
imlib2.oe imlib2-native.oe imlib2.bb imlib2Xnative.bb
SCRIPTS = $(bin_SCRIPTS)
DATA = $(pkgconfig_DATA)
DIST_COMMON = README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \
Makefile.am Makefile.in NEWS TODO aclocal.m4 config.guess config.h.in \
config.sub configure configure.in imlib2-config.in imlib2.pc.in \
install-sh ltmain.sh missing mkinstalldirs
Makefile.am Makefile.in NEWS README.in TODO aclocal.m4 config.guess \
config.h.in config.sub configure configure.in imlib2-config.in \
imlib2-native.oe.in imlib2.bb.in imlib2.oe.in imlib2.pc.in \
imlib2.spec.in imlib2Xnative.bb.in install-sh ltmain.sh missing \
mkinstalldirs
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
......@@ -167,9 +172,21 @@ distclean-hdr:
-rm -f config.h
maintainer-clean-hdr:
imlib2.pc: $(top_builddir)/config.status imlib2.pc.in
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
imlib2-config: $(top_builddir)/config.status imlib2-config.in
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
imlib2.pc: $(top_builddir)/config.status imlib2.pc.in
README: $(top_builddir)/config.status README.in
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
imlib2.spec: $(top_builddir)/config.status imlib2.spec.in
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
imlib2.oe: $(top_builddir)/config.status imlib2.oe.in
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
imlib2-native.oe: $(top_builddir)/config.status imlib2-native.oe.in
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
imlib2.bb: $(top_builddir)/config.status imlib2.bb.in
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
imlib2Xnative.bb: $(top_builddir)/config.status imlib2Xnative.bb.in
cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
install-binSCRIPTS: $(bin_SCRIPTS)
......@@ -337,6 +354,7 @@ distdir: $(DISTFILES)
-rm -rf $(distdir)
mkdir $(distdir)
-chmod 777 $(distdir)
$(mkinstalldirs) $(distdir)/debian
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
......@@ -357,7 +375,6 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
done
$(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
info-am:
info: info-recursive
dvi-am:
......@@ -437,12 +454,6 @@ installdirs mostlyclean-generic distclean-generic clean-generic \
maintainer-clean-generic clean mostlyclean distclean maintainer-clean
dist-hook:
./gendoc; \
tar cvf imlib2_docs.tar doc; \
rm -f imlib2_docs.tar.gz; \
gzip -9 imlib2_docs.tar;
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
###############################################################################
# #
# I M L I B 2 #
# #
###############################################################################
Imlib2 1.2.1
This is the Imlib 2 library - a library that does image file loading and
saving as well as rendering, manipulation, arbitrary polygon support, etc.
......@@ -21,21 +17,38 @@ libjpeg http://www.ijg.org/
libpng http://www.libpng.org/pub/png/libpng.html
freetype 2.1.x http://www.freetype.org/
For examples of this library in use, seek:
Eterm http://www.eterm.org/ (CVS version only, currently)
feh http://www.linuxbrit.co.uk/feh.html
geist http://www.linuxbrit.co.uk/geist.html
------------------------------------------------------------------------------
COMPILING AND INSTALLING:
./configure
make
(as root unless youa re installing in your users directories):
make install
------------------------------------------------------------------------------
BUILDING PACKAGES:
RPM: To build rpm packages:
sudo rpm -ta imlib2-1.2.1.tar.gz
You will find rpm packages in your system /usr/src/redhat/* dirs (note you may
not need to use sudo or root if you have your own ~/.rpmrc. see rpm documents
for more details)
DEB: To build deb packages:
A blurb about each of the directories:
tar zvf imlib2-1.2.1.tar.gz
cd imlib2-1.2.1
dpkg-buildpackage -us -uc -rfakeroot
cd ..
rm -rf imlib2-1.2.1
debian/ Debian build files
demo/ Demo view program
doc/ Documentation for imlib2, primarily in html
filters/ Filter shared objects
libltdl/ Libtool LGPL-licensed loadable module support library source
loaders/ Imlib2's image loader-savers (jpg, png, etc)
src/ Imlib2 main source
test/ Test program(s)
You will find all the debian source, binary etc. packages put in the directory
where you first untarred the source tarball.
Imlib2 @VERSION@
This is the Imlib 2 library - a library that does image file loading and
saving as well as rendering, manipulation, arbitrary polygon support, etc.
It does ALL of these operations FAST. Imlib2 also tries to be highly
intelligent about doing them, so writing naive programs can be done
easily, without sacrificing speed.
This is a complete rewrite over the Imlib 1.x series. The architecture is
more modular, simple, and flexible. See index.html in the doc/ directory
for more information.
Imlib2 requires several libraries to be already installed. These are:
libjpeg http://www.ijg.org/
libpng http://www.libpng.org/pub/png/libpng.html
freetype 2.1.x http://www.freetype.org/
For examples of this library in use, seek:
Eterm http://www.eterm.org/ (CVS version only, currently)
feh http://www.linuxbrit.co.uk/feh.html
geist http://www.linuxbrit.co.uk/geist.html
------------------------------------------------------------------------------
COMPILING AND INSTALLING:
./configure
make
(as root unless youa re installing in your users directories):
make install
------------------------------------------------------------------------------
BUILDING PACKAGES:
RPM: To build rpm packages:
sudo rpm -ta @PACKAGE@-@VERSION@.tar.gz
You will find rpm packages in your system /usr/src/redhat/* dirs (note you may
not need to use sudo or root if you have your own ~/.rpmrc. see rpm documents
for more details)
DEB: To build deb packages:
tar zvf @PACKAGE@-@VERSION@.tar.gz
cd @PACKAGE@-@VERSION@
dpkg-buildpackage -us -uc -rfakeroot
cd ..
rm -rf @PACKAGE@-@VERSION@
You will find all the debian source, binary etc. packages put in the directory
where you first untarred the source tarball.
......@@ -10,13 +10,11 @@ dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
dnl PARTICULAR PURPOSE.
# lib-prefix.m4 serial 3 (gettext-0.13)
dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
dnl that contains a configuration script generated by Autoconf, under
dnl the same distribution terms as the rest of that program.
# lib-prefix.m4 serial 4 (gettext-0.14.2)
dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl From Bruno Haible.
......@@ -83,7 +81,7 @@ AC_DEFUN([AC_LIB_PREFIX],
if test "X$additional_includedir" = "X/usr/local/include"; then
if test -n "$GCC"; then
case $host_os in
linux*) haveit=yes;;
linux* | gnu* | k*bsd*-gnu) haveit=yes;;
esac
fi
fi
......@@ -166,16 +164,16 @@ AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
prefix="$acl_save_prefix"
])
# lib-link.m4 serial 4 (gettext-0.12)
dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
dnl that contains a configuration script generated by Autoconf, under
dnl the same distribution terms as the rest of that program.
# lib-link.m4 serial 6 (gettext-0.14.3)
dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl From Bruno Haible.
AC_PREREQ(2.50)
dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
dnl the libraries corresponding to explicit and implicit dependencies.
dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
......@@ -263,6 +261,8 @@ dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
dnl hardcode_direct, hardcode_minus_L.
AC_DEFUN([AC_LIB_RPATH],
[
dnl Tell automake >= 1.10 to complain if config.rpath is missing.
m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([config.rpath])])
AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
......@@ -518,7 +518,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
if test "X$additional_includedir" = "X/usr/local/include"; then
if test -n "$GCC"; then
case $host_os in
linux*) haveit=yes;;
linux* | gnu* | k*bsd*-gnu) haveit=yes;;
esac
fi
fi
......@@ -567,7 +567,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
if test "X$additional_libdir" = "X/usr/local/lib"; then
if test -n "$GCC"; then
case $host_os in
linux*) haveit=yes;;
linux* | gnu* | k*bsd*-gnu) haveit=yes;;
esac
fi
fi
......@@ -720,11 +720,9 @@ AC_DEFUN([AC_LIB_APPENDTOVAR],
# lib-ld.m4 serial 3 (gettext-0.13)
dnl Copyright (C) 1996-2003 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
dnl that contains a configuration script generated by Autoconf, under
dnl the same distribution terms as the rest of that program.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl Subroutines of libtool.m4,
dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision
......@@ -833,11 +831,9 @@ AC_LIB_PROG_LD_GNU
# isc-posix.m4 serial 2 (gettext-0.11.2)
dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
dnl This file is free software, distributed under the terms of the GNU
dnl General Public License. As a special exception to the GNU General
dnl Public License, this file may be distributed as part of a program
dnl that contains a configuration script generated by Autoconf, under
dnl the same distribution terms as the rest of that program.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
# This file is not needed with autoconf-2.53 and newer. Remove it in 2005.
......
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
timestamp='2004-11-12'
timestamp='2005-04-22'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
......@@ -53,7 +53,7 @@ version="\
GNU config.guess ($timestamp)
Originally written by Per Bothner.
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
......@@ -804,6 +804,9 @@ EOF
i*:UWIN*:*)
echo ${UNAME_MACHINE}-pc-uwin
exit 0 ;;
amd64:CYGWIN*:*:*)
echo x86_64-unknown-cygwin
exit 0 ;;
p*:CYGWIN*:*)
echo powerpcle-unknown-cygwin
exit 0 ;;
......@@ -1137,6 +1140,10 @@ EOF
# From seanf@swdc.stratus.com.
echo i860-stratus-sysv4
exit 0 ;;
i*86:VOS:*:*)
# From Paul.Green@stratus.com.
echo ${UNAME_MACHINE}-stratus-vos
exit 0 ;;
*:VOS:*:*)
# From Paul.Green@stratus.com.
echo hppa1.1-stratus-vos
......@@ -1197,6 +1204,9 @@ EOF
*:QNX:*:4*)
echo i386-pc-qnx
exit 0 ;;
NSE-?:NONSTOP_KERNEL:*:*)
echo nse-tandem-nsk${UNAME_RELEASE}
exit 0 ;;
NSR-?:NONSTOP_KERNEL:*:*)
echo nsr-tandem-nsk${UNAME_RELEASE}
exit 0 ;;
......@@ -1413,7 +1423,9 @@ This script, last modified $timestamp, has failed to recognize
the operating system you are using. It is advised that you
download the most up to date version of the config scripts from
ftp://ftp.gnu.org/pub/gnu/config/
http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
and
http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
If the version you run ($0) is already up to date, please
send the following data and any information you think might be
......
......@@ -3,6 +3,9 @@
/* enabling X11 support */
#undef BUILD_X11
/* enabling AMD64 Assembly */
#undef DO_AMD64_ASM
/* enabling MMX Assembly */
#undef DO_MMX_ASM
......
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
timestamp='2004-11-30'
timestamp='2005-04-22'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
......@@ -70,7 +70,7 @@ Report bugs and patches to <config-patches@gnu.org>."
version="\
GNU config.sub ($timestamp)
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
......@@ -231,13 +231,14 @@ case $basic_machine in
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
| fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
| m32r | m32rle | m68000 | m68k | m88k | mcore \
| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
......@@ -262,7 +263,8 @@ case $basic_machine in
| pyramid \
| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \
| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
| sparcv8 | sparcv9 | sparcv9b \
| strongarm \
| tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
......@@ -298,7 +300,7 @@ case $basic_machine in
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
| avr-* \
| bs2000-* \
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
| clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
......@@ -310,7 +312,7 @@ case $basic_machine in
| ip2k-* | iq2000-* \
| m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
| m88110-* | m88k-* | mcore-* \
| m88110-* | m88k-* | maxq-* | mcore-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
......@@ -336,7 +338,8 @@ case $basic_machine in
| romp-* | rs6000-* \
| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
| sparclite-* \
| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
| tahoe-* | thumb-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
......
This diff is collapsed.
......@@ -4,9 +4,8 @@ rm -f config.cache
AC_INIT(configure.in)
AC_CANONICAL_BUILD
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
AC_ISC_POSIX
AM_INIT_AUTOMAKE(imlib2, 1.2.0)
AM_INIT_AUTOMAKE(imlib2, 1.2.1)
AM_CONFIG_HEADER(config.h)
AC_C_BIGENDIAN
......@@ -86,40 +85,48 @@ dnl Set PACKAGE_SOURCE_DIR in config.h.
packagesrcdir=`cd $srcdir && pwd`
AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [Source code directory])
# FIXME: fill in requirements for pc.in - but only ft2 has a pc file!
requirements="freetype2"
mmx=no
AC_ARG_ENABLE(mmx,[ --disable-mmx attempt compiling using mmx assembly [default=yes]],
amd64=no
case $host_cpu in
i*86)
mmx="yes"
;;
x86_64)
amd64="yes"
;;
esac
AC_ARG_ENABLE(mmx,[ --enable-mmx attempt compiling using mmx assembly [default=auto]],
[
if test x$enableval = xyes; then
mmx=yes
# Cannot compile with both options enabled
amd64=no
AC_MSG_RESULT(enabling mmx support)
else
mmx=no
AC_MSG_RESULT(disabling mmx support)
fi
],
]
)
AC_ARG_ENABLE(amd64,[ --enable-amd64 attempt compiling using amd64 assembly [default=auto]],
[
if test x$target_os = xlinux-gnu; then
if test x$target_cpu = x$host_cpu; then
mmx=`cat /proc/cpuinfo | grep mmx`
if test -n "$mmx"; then
mmx=yes
fi
if test x$enableval = xyes; then
amd64=yes
# Cannot compile with both options enabled
mmx=no
AC_MSG_RESULT(enabling amd64 support)
else
echo ""
echo "You are cross-compiling on a "$host_cpu" machine for a "$target_os" machine."
echo "If this target supports mmx, please enable mmx with --enable-mmx as a"
echo "configure option."
echo ""
amd64=no
AC_MSG_RESULT(disabling amd64 support)
fi
else
echo ""
echo "You are not running Linux - This script cannot auto-detect mmx assembly."
echo "You will have to enable the mmx assembly (which gives anywhere from 10%"
echo "to 300% speedups) by adding --enable-mmx on the configure command-line."
echo ""
fi
]
)
if test x$mmx = xyes; then
AC_DEFINE(DO_MMX_ASM, 1, [enabling MMX Assembly])
AC_MSG_RESULT(enabled mmx support)
......@@ -127,6 +134,13 @@ else
AC_MSG_RESULT(disabled mmx support)
fi
AM_CONDITIONAL(BUILD_MMX, test x$mmx = xyes)
if test x$amd64 = xyes; then
AC_DEFINE(DO_AMD64_ASM, 1, [enabling AMD64 Assembly])
AC_MSG_RESULT(enabled amd64 support)
else
AC_MSG_RESULT(disabled amd64 support)
fi
AM_CONDITIONAL(BUILD_AMD64, test x$amd64 = xyes)
# check for freetype
AC_ARG_WITH(freetype-config, [ --with-freetype-config=FREETYPE_CONFIG use freetype-config specified ],
......@@ -139,35 +153,30 @@ AC_ARG_WITH(freetype-config, [ --with-freetype-config=FREETYPE_CONFIG use fr
freetype_cflags=`$FREETYPE_CONFIG --cflags`
freetype_libs=`$FREETYPE_CONFIG --libs`
x11=no
AC_ARG_ENABLE(x11,[ --disable-x11 attempt to build with X11 support [default=yes]],
[
if test x$enableval = xyes; then
have_x=yes
AC_PATH_X([X11], [X11/Xlib.h], [XOpenDisplay(NULL)])
if test "x$have_x" = "xno"; then
# If --without-x was passed, this will be "disabled" instead of "no" --
# so always treat "no" as an error
AC_MSG_ERROR(
[no X support found. Use --x-includes and --x-libraries to specify the X
path on your system, or --without-x to disable X support.])
fi
if test "x$have_x" = "xyes"; then
if test "x$x_includes" != "x"; then
x_cflags="-I$x_includes"
fi
if test "x$x_libraries" != "x"; then
x_libs="-L$x_libraries -lX11 -lXext"
else
have_x=no
x_libs="-lX11 -lXext"
fi
],
[
AC_CHECK_HEADER(X11/X.h,
[ have_x="yes" ],
[ have_x="no" ]
)
]
)
AC_MSG_CHECKING(whether X11 support is to be enabled)
if test "x$have_x" = "xyes"; then
x_dir="/usr/X11R6";
x_cflags="-I"$x_dir"/include"
x_libs="-L"$x_dir"/lib -lX11 -lXext"
AC_MSG_RESULT(enabling X11 support)
AM_CONDITIONAL(BUILD_X11, true)
AC_DEFINE(BUILD_X11, 1, [enabling X11 support])
else
x_dir=""
x_cflags=""
x_libs=""
AC_MSG_RESULT(disabling X11 support)
AM_CONDITIONAL(BUILD_X11, false)
fi
......@@ -354,9 +363,12 @@ if test "$bz2_ok" = yes; then
fi
AM_CONDITIONAL(BUILD_BZ2_LOADER, test "$bz2_ok" = yes)
AC_SUBST(BZ2LIBS)
AC_SUBST(requirements)
AC_OUTPUT([
Makefile
imlib2.pc
src/Makefile
src/lib/Makefile
src/bin/Makefile
......@@ -367,12 +379,16 @@ data/Makefile
data/fonts/Makefile
data/images/Makefile
doc/Makefile
debian/Makefile
imlib2-config
imlib2.pc
README
imlib2.spec
imlib2.oe
imlib2-native.oe
imlib2.bb
imlib2Xnative.bb
debian/changelog
],[
chmod +x imlib2-config
touch imlib2_docs.tar.gz
])
#####################################################################
......@@ -397,6 +413,10 @@ echo " ZLIB....................: $zlib_ok"
echo " BZIP2...................: $bz2_ok"
echo
echo
echo "Use MMX for extra speed...: $mmx"
echo "Use AMD64 for extra speed.: $amd64"
echo
echo
echo "Installation Path.........: $prefix"
echo
echo "Compilation...............: make"
......
......@@ -93,6 +93,7 @@ VERSION = @VERSION@
ZLIBLIBS = @ZLIBLIBS@
my_includes = @my_includes@
my_libs = @my_libs@
requirements = @requirements@
MAINTAINERCLEANFILES = Makefile.in
SUBDIRS = fonts images
......
......@@ -93,6 +93,7 @@ VERSION = @VERSION@
ZLIBLIBS = @ZLIBLIBS@
my_includes = @my_includes@
my_libs = @my_libs@
requirements = @requirements@
MAINTAINERCLEANFILES = Makefile.in
......
......@@ -93,6 +93,7 @@ VERSION = @VERSION@
ZLIBLIBS = @ZLIBLIBS@
my_includes = @my_includes@
my_libs = @my_libs@
requirements = @requirements@
MAINTAINERCLEANFILES = Makefile.in
......
......@@ -93,6 +93,7 @@ VERSION = @VERSION@
ZLIBLIBS = @ZLIBLIBS@
my_includes = @my_includes@
my_libs = @my_libs@
requirements = @requirements@
MAINTAINERCLEANFILES = Makefile.in
......
DESCRIPTION = "A graphic library for file loading, saving, rendering, and \
manipulation."
HOMEPAGE = "http://www.enlightenment.org"
MAINTAINER = "Carsten Haitzler (Rasterman) <raster@rasterman.com>"
SECTION = "e/libs"
PRIORITY = "optional"
include imlib2.oe
inherit native
DEPENDS = "freetype-native libpng-native jpeg-native"
do_stage () {
oe_libinstall -C src/lib libImlib2 ${STAGING_LIBDIR}/
install -m 0644 ${S}/src/lib/Imlib2.h ${STAGING_INCDIR}/
}
DESCRIPTION = "A graphic library for file loading, saving, rendering, and \
manipulation."
HOMEPAGE = "http://www.enlightenment.org"
MAINTAINER = "Carsten Haitzler (Rasterman) <raster@rasterman.com>"
SECTION = "e/libs"
PRIORITY = "optional"
include imlib2.oe
inherit native
DEPENDS = "freetype-native libpng-native jpeg-native"
do_stage () {
oe_libinstall -C src/lib libImlib2 ${STAGING_LIBDIR}/
install -m 0644 ${S}/src/lib/Imlib2.h ${STAGING_INCDIR}/
}
DESCRIPTION = "A graphic library for file loading, saving, rendering, and \
manipulation."
HOMEPAGE = "http://www.enlightenment.org"
MAINTAINER = "Carsten Haitzler (Rasterman) <raster@rasterman.com>"
SECTION = "e/libs"
PRIORITY = "optional"
DEPENDS = "freetype libpng jpeg"
PV = "1.2.1"
PR = "1"