Fri Jul 2 14:41:17 2004 Michael Jennings (mej)
Now builds properly on Vermillion, cAos, and CentOS. Hopefully others too. :-) ---------------------------------------------------------------------- SVN revision: 10667
This commit is contained in:
Michael Jennings
parent
e7902d6c77
commit
d83cddee16
|
|
@ -2989,3 +2989,10 @@ Sat Jul 12 21:33:20 EDT 2003
|
|||
Up version numbers.
|
||||
|
||||
_______________________________________________
|
||||
|
||||
Fri Jul 2 14:39:46 EDT 2004
|
||||
(KainX)
|
||||
|
||||
Fixed build (again).
|
||||
|
||||
_______________________________________________
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ MAINTAINERCLEANFILES = INSTALL Makefile.in aclocal.m4 config.guess \
|
|||
ltconfig ltmain.sh missing mkinstalldirs \
|
||||
stamp-h.in
|
||||
|
||||
SUBDIRS = src filters doc loaders test demo
|
||||
SUBDIRS = src filters doc loaders test demo libltdl
|
||||
|
||||
bin_SCRIPTS = imlib2-config
|
||||
|
||||
|
|
|
|||
64
autogen.sh
64
autogen.sh
|
|
@ -1,13 +1,59 @@
|
|||
#!/bin/sh
|
||||
# Run this to generate all the initial makefiles, etc.
|
||||
# $Id$
|
||||
|
||||
rm -rf autom4te.cache
|
||||
rm -f aclocal.m4
|
||||
broken() {
|
||||
echo
|
||||
echo "You need libtool, autoconf, and automake. Install them"
|
||||
echo "and try again. Get source at ftp://ftp.gnu.org/pub/gnu/"
|
||||
echo "ERROR: $1 not found."
|
||||
exit -1
|
||||
}
|
||||
|
||||
echo "Running aclocal..."; aclocal $ACLOCAL_FLAGS -I m4 \
|
||||
&& echo "Running autoheader..."; autoheader \
|
||||
&& echo "Running autoconf..."; autoconf \
|
||||
&& echo "Running libtoolize..."; libtoolize --automake \
|
||||
&& echo "Running automake..."; automake --add-missing --copy --gnu
|
||||
DIE=0
|
||||
|
||||
### If you want this, uncomment it.
|
||||
./configure "$@"
|
||||
echo "Generating configuration files for Imlib2, please wait...."
|
||||
|
||||
LIBTOOLIZE_CHOICES="$LIBTOOLIZE libtoolize"
|
||||
AUTOHEADER_CHOICES="$AUTOHEADER autoheader213 autoheader-2.13 autoheader"
|
||||
ACLOCAL_CHOICES="$ACLOCAL aclocal14 aclocal-1.4 aclocal"
|
||||
AUTOMAKE_CHOICES="$AUTOMAKE automake14 automake-1.4 automake"
|
||||
AUTOCONF_CHOICES="$AUTOCONF autoconf213 autoconf-2.13 autoconf"
|
||||
|
||||
for i in $LIBTOOLIZE_CHOICES ; do
|
||||
$i --version </dev/null >/dev/null 2>&1 && LIBTOOLIZE=$i && break
|
||||
done
|
||||
[ "x$LIBTOOLIZE" = "x" ] && broken libtool
|
||||
|
||||
for i in $AUTOHEADER_CHOICES ; do
|
||||
$i --version </dev/null >/dev/null 2>&1 && AUTOHEADER=$i && break
|
||||
done
|
||||
[ "x$AUTOHEADER" = "x" ] && broken autoconf
|
||||
|
||||
for i in $ACLOCAL_CHOICES ; do
|
||||
$i --version </dev/null >/dev/null 2>&1 && ACLOCAL=$i && break
|
||||
done
|
||||
[ "x$ACLOCAL" = "x" ] && broken automake
|
||||
|
||||
for i in $AUTOMAKE_CHOICES ; do
|
||||
$i --version </dev/null >/dev/null 2>&1 && AUTOMAKE=$i && break
|
||||
done
|
||||
[ "x$AUTOMAKE" = "x" ] && broken automake
|
||||
|
||||
for i in $AUTOCONF_CHOICES ; do
|
||||
$i --version </dev/null >/dev/null 2>&1 && AUTOCONF=$i && break
|
||||
done
|
||||
[ "x$AUTOCONF" = "x" ] && broken autoconf
|
||||
|
||||
# Export them so configure can AC_SUBST() them.
|
||||
export LIBTOOLIZE AUTOHEADER ACLOCAL AUTOMAKE AUTOCONF
|
||||
|
||||
# Run the stuff.
|
||||
(set -x && $LIBTOOLIZE -c -f --ltdl)
|
||||
(set -x && $AUTOHEADER)
|
||||
(set -x && $ACLOCAL $ACLOCAL_FLAGS -I m4)
|
||||
(set -x && $AUTOMAKE -a -c)
|
||||
(set -x && $AUTOCONF)
|
||||
|
||||
# Run configure.
|
||||
./configure `sh config.guess` "$@"
|
||||
|
|
|
|||
40
configure.in
40
configure.in
|
|
@ -1,7 +1,9 @@
|
|||
dnl Process this file with autoconf to create configure.
|
||||
|
||||
AC_INIT
|
||||
AC_CONFIG_SRCDIR([src/Imlib2.h])
|
||||
dnl# This stuff does not work for autoconf-2.13
|
||||
dnl# AC_INIT
|
||||
dnl# AC_CONFIG_SRCDIR([src/Imlib2.h])
|
||||
AC_INIT([src/Imlib2.h])
|
||||
AC_CANONICAL_TARGET([])
|
||||
AM_INIT_AUTOMAKE(imlib2, 1.1.1)
|
||||
|
||||
|
|
@ -118,16 +120,14 @@ AC_SUBST(pkglibdir)
|
|||
|
||||
AC_C_BIGENDIAN
|
||||
|
||||
AC_LIBLTDL_CONVENIENCE
|
||||
|
||||
AC_PROG_CC
|
||||
AM_PROG_CC_STDC
|
||||
AC_C_CONST
|
||||
|
||||
AM_ENABLE_SHARED
|
||||
dnl AM_DISABLE_STATIC
|
||||
AC_LIBTOOL_DLOPEN
|
||||
dnl AC_LIBTOOL_WIN32_DLL
|
||||
dnl# This doesn't work right.
|
||||
dnl# AC_LIBLTDL_CONVENIENCE
|
||||
dnl# AC_LIB_LTDL
|
||||
|
||||
AM_PROG_LIBTOOL
|
||||
AM_WITH_DMALLOC
|
||||
|
||||
|
|
@ -206,8 +206,9 @@ AC_SUBST(X_OBJS)
|
|||
|
||||
# This is necessary so that .o files in LIBOBJS are also built via
|
||||
# the ANSI2KNR-filtering rules.
|
||||
LIB@&t@OBJS=`echo "$LIB@&t@OBJS" |
|
||||
sed 's,\.[[^.]]* ,$U&,g;s,\.[[^.]]*$,$U&,'`
|
||||
dnl# Doesn't work with autoconf-2.13!
|
||||
dnl# LIB@&t@OBJS=`echo "$LIB@&t@OBJS" |
|
||||
dnl# sed 's,\.[[^.]]* ,$U&,g;s,\.[[^.]]*$,$U&,'`
|
||||
LTLIBOBJS=`echo "$LIB@&t@OBJS" |
|
||||
sed 's,\.[[^.]]* ,.lo ,g;s,\.[[^.]]*$,.lo,'`
|
||||
AC_SUBST(LTLIBOBJS)
|
||||
|
|
@ -416,10 +417,15 @@ AC_SUBST(freetype_libs)
|
|||
dnl AC_SUBST(freetype_libs)
|
||||
dnl AC_SUBST(freetype_includes)
|
||||
|
||||
AC_CONFIG_FILES([imlib2-config imlib2.pc Makefile loaders/Makefile src/Makefile test/Makefile \
|
||||
filters/Makefile demo/Makefile doc/Makefile \
|
||||
])
|
||||
AC_CONFIG_COMMANDS([default],[[
|
||||
chmod +x imlib2-config
|
||||
]],[[]])
|
||||
AC_OUTPUT
|
||||
dnl# This stuff is not compatible with autoconf-2.13
|
||||
dnl# AC_CONFIG_FILES([imlib2-config imlib2.pc Makefile loaders/Makefile src/Makefile test/Makefile \
|
||||
dnl# filters/Makefile demo/Makefile doc/Makefile libltdl/Makefile \
|
||||
dnl# ])
|
||||
dnl# AC_CONFIG_COMMANDS([default],[[
|
||||
dnl# chmod +x imlib2-config
|
||||
dnl# ]],[[]])
|
||||
dnl# AC_OUTPUT
|
||||
|
||||
AC_OUTPUT([imlib2-config imlib2.pc Makefile loaders/Makefile src/Makefile test/Makefile \
|
||||
filters/Makefile demo/Makefile doc/Makefile libltdl/Makefile \
|
||||
])
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
Summary: Powerful image loading and rendering library
|
||||
Name: imlib2
|
||||
Version: 1.1.1
|
||||
Release: 1
|
||||
Release: 2
|
||||
Copyright: BSD
|
||||
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@twistedpath.org>, Joakim Bodin <bodin@dreamhosted.com>
|
||||
Packager: Michael Jennings <mej@eterm.org>
|
||||
URL: http://www.rasterman.com/raster/imlib.html
|
||||
Requires: %{name}-loader_jpeg = %{version}
|
||||
Requires: %{name}-loader_png = %{version}
|
||||
|
|
|
|||
Loading…
Reference in New Issue