* builds/unix/configure.ac: Generate `freetype.pc' from
`freetype.in'. * builds/unix/configure: Regenerated. * builds/unix/install.mk (install, uninstall): Handle `freetype.pc'. * builds/unix/freetype2.in: New file. Contains building information for the `pkg-config' package.
This commit is contained in:
Werner Lemberg
parent
d8425fb3ae
commit
a9903f8a16
12
ChangeLog
12
ChangeLog
|
|
@ -1,3 +1,15 @@
|
|||
2003-04-28 Werner Lemberg <wl@gnu.org>
|
||||
|
||||
* builds/unix/configure.ac: Generate `freetype.pc' from
|
||||
`freetype.in'.
|
||||
* builds/unix/configure: Regenerated.
|
||||
* builds/unix/install.mk (install, uninstall): Handle `freetype.pc'.
|
||||
|
||||
2003-04-28 Gustavo J. A. M. Carneiro <gjc@inescporto.pt>
|
||||
|
||||
* builds/unix/freetype2.in: New file. Contains building information
|
||||
for the `pkg-config' package.
|
||||
|
||||
2003-04-28 David Turner <david@freetype.org>
|
||||
|
||||
* src/base/ftobjs.c (FT_Load_Glyph): Fix boundary check for
|
||||
|
|
|
|||
|
|
@ -4299,7 +4299,6 @@ done
|
|||
|
||||
|
||||
|
||||
|
||||
# Check whether --with-zlib or --without-zlib was given.
|
||||
if test "${with_zlib+set}" = set; then
|
||||
withval="$with_zlib"
|
||||
|
|
@ -4475,8 +4474,6 @@ fi
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
# Check whether --enable-shared or --disable-shared was given.
|
||||
if test "${enable_shared+set}" = set; then
|
||||
enableval="$enable_shared"
|
||||
|
|
@ -5625,7 +5622,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
|
|||
case $host in
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 5628 "configure"' > conftest.$ac_ext
|
||||
echo '#line 5625 "configure"' > conftest.$ac_ext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -6139,7 +6136,7 @@ chmod -w .
|
|||
save_CFLAGS="$CFLAGS"
|
||||
CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
|
||||
compiler_c_o=no
|
||||
if { (eval echo configure:6142: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
|
||||
if { (eval echo configure:6139: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings
|
||||
if test -s out/conftest.err; then
|
||||
|
|
@ -7913,7 +7910,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 7916 "configure"
|
||||
#line 7913 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -8011,7 +8008,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 8014 "configure"
|
||||
#line 8011 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -8739,7 +8736,7 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
|
|||
|
||||
|
||||
|
||||
ac_config_files="$ac_config_files unix-cc.mk:unix-cc.in unix-def.mk:unix-def.in freetype-config"
|
||||
ac_config_files="$ac_config_files unix-cc.mk:unix-cc.in unix-def.mk:unix-def.in freetype-config freetype2.pc:freetype2.in"
|
||||
|
||||
|
||||
|
||||
|
|
@ -9250,6 +9247,7 @@ do
|
|||
"unix-cc.mk" ) CONFIG_FILES="$CONFIG_FILES unix-cc.mk:unix-cc.in" ;;
|
||||
"unix-def.mk" ) CONFIG_FILES="$CONFIG_FILES unix-def.mk:unix-def.in" ;;
|
||||
"freetype-config" ) CONFIG_FILES="$CONFIG_FILES freetype-config" ;;
|
||||
"freetype2.pc" ) CONFIG_FILES="$CONFIG_FILES freetype2.pc:freetype2.in" ;;
|
||||
"ftconfig.h" ) CONFIG_HEADERS="$CONFIG_HEADERS ftconfig.h:ftconfig.in" ;;
|
||||
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
|
||||
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
|
||||
|
|
|
|||
|
|
@ -102,7 +102,10 @@ AC_PROG_LIBTOOL
|
|||
dnl create the Unix-specific sub-Makefiles `builds/unix/unix-def.mk'
|
||||
dnl and 'builds/unix/unix-cc.mk' that will be used by the build system
|
||||
dnl
|
||||
AC_CONFIG_FILES([unix-cc.mk:unix-cc.in unix-def.mk:unix-def.in freetype-config])
|
||||
AC_CONFIG_FILES([unix-cc.mk:unix-cc.in
|
||||
unix-def.mk:unix-def.in
|
||||
freetype-config
|
||||
freetype2.pc:freetype2.in])
|
||||
|
||||
dnl re-generate the Jamfile to use libtool now
|
||||
dnl
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
prefix=@prefix@
|
||||
exec_prefix=@exec_prefix@
|
||||
libdir=@libdir@
|
||||
includedir=@includedir@
|
||||
|
||||
Name: FreeType 2
|
||||
Description: A free, high-quality, and portable font engine.
|
||||
Version: @VERSION@
|
||||
Requires:
|
||||
Libs: -L${libdir} -lfreetype @LIBZ@
|
||||
Cflags: -I${includedir}/freetype2
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
#
|
||||
|
||||
|
||||
# Copyright 1996-2000, 2002 by
|
||||
# Copyright 1996-2000, 2002, 2003 by
|
||||
# David Turner, Robert Wilhelm, and Werner Lemberg.
|
||||
#
|
||||
# This file is part of the FreeType project, and may only be used, modified,
|
||||
|
|
@ -25,6 +25,7 @@
|
|||
# Unix installation and deinstallation targets.
|
||||
install: $(PROJECT_LIBRARY)
|
||||
$(MKINSTALLDIRS) $(DESTDIR)$(libdir) \
|
||||
$(DESTDIR)$(libdir)/pkgconfig \
|
||||
$(DESTDIR)$(includedir)/freetype2/freetype/config \
|
||||
$(DESTDIR)$(includedir)/freetype2/freetype/internal \
|
||||
$(DESTDIR)$(includedir)/freetype2/freetype/cache \
|
||||
|
|
@ -53,6 +54,8 @@ install: $(PROJECT_LIBRARY)
|
|||
$(DESTDIR)$(bindir)/freetype-config
|
||||
$(INSTALL_SCRIPT) -m 644 $(BUILD)/freetype2.m4 \
|
||||
$(DESTDIR)$(datadir)/aclocal/freetype2.m4
|
||||
$(INSTALL_SCRIPT) -m 644 $(OBJ_BUILD)/freetype2.pc \
|
||||
$(DESTDIR)$(libdir)/pkgconfig/freetype2.pc
|
||||
|
||||
|
||||
uninstall:
|
||||
|
|
@ -69,6 +72,7 @@ uninstall:
|
|||
-$(DELETE) $(DESTDIR)$(includedir)/ft2build.h
|
||||
-$(DELETE) $(DESTDIR)$(bindir)/freetype-config
|
||||
-$(DELETE) $(DESTDIR)$(datadir)/aclocal/freetype2.m4
|
||||
-$(DELETE) $(DESTDIR)$(libdir)/pkgconfig/freetype2.pc
|
||||
|
||||
|
||||
check:
|
||||
|
|
|
|||
Loading…
Reference in New Issue