Make freetype-config aware of $SYSROOT.
* builds/unix/freetype-config.in: Decorate with ${SYSROOT} where appropriate.
This commit is contained in:
parent
64ed303897
commit
978b11dc59
|
@ -1,3 +1,10 @@
|
||||||
|
2009-12-22 Marc Kleine-Budde <mkl@pengutronix.de>
|
||||||
|
|
||||||
|
Make freetype-config aware of $SYSROOT.
|
||||||
|
|
||||||
|
* builds/unix/freetype-config.in: Decorate with ${SYSROOT} where
|
||||||
|
appropriate.
|
||||||
|
|
||||||
2009-12-20 Werner Lemberg <wl@gnu.org>
|
2009-12-20 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
Fix compiler warning.
|
Fix compiler warning.
|
||||||
|
|
|
@ -101,11 +101,11 @@ if test "$local_prefix" = "yes" ; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$echo_prefix" = "yes" ; then
|
if test "$echo_prefix" = "yes" ; then
|
||||||
echo $prefix
|
echo ${SYSROOT}$prefix
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$echo_exec_prefix" = "yes" ; then
|
if test "$echo_exec_prefix" = "yes" ; then
|
||||||
echo $exec_prefix
|
echo ${SYSROOT}$exec_prefix
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$exec_prefix_set" = "yes" ; then
|
if test "$exec_prefix_set" = "yes" ; then
|
||||||
|
@ -118,22 +118,22 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$echo_ft_version" = "yes" ; then
|
if test "$echo_ft_version" = "yes" ; then
|
||||||
major=`grep define $includedir/freetype2/freetype/freetype.h \
|
major=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
|
||||||
| grep FREETYPE_MAJOR \
|
| grep FREETYPE_MAJOR \
|
||||||
| sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'`
|
| sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'`
|
||||||
minor=`grep define $includedir/freetype2/freetype/freetype.h \
|
minor=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
|
||||||
| grep FREETYPE_MINOR \
|
| grep FREETYPE_MINOR \
|
||||||
| sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'`
|
| sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'`
|
||||||
patch=`grep define $includedir/freetype2/freetype/freetype.h \
|
patch=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \
|
||||||
| grep FREETYPE_PATCH \
|
| grep FREETYPE_PATCH \
|
||||||
| sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'`
|
| sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'`
|
||||||
echo $major.$minor.$patch
|
echo $major.$minor.$patch
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test "$echo_cflags" = "yes" ; then
|
if test "$echo_cflags" = "yes" ; then
|
||||||
cflags="-I$includedir/freetype2"
|
cflags="-I${SYSROOT}$includedir/freetype2"
|
||||||
if test "$includedir" != "/usr/include" ; then
|
if test "${SYSROOT}$includedir" != "/usr/include" ; then
|
||||||
echo $cflags -I$includedir
|
echo $cflags -I${SYSROOT}$includedir
|
||||||
else
|
else
|
||||||
echo $cflags
|
echo $cflags
|
||||||
fi
|
fi
|
||||||
|
@ -145,8 +145,8 @@ if test "$echo_libs" = "yes" ; then
|
||||||
eval "rpath=\"$hardcode_libdir_flag_spec\""
|
eval "rpath=\"$hardcode_libdir_flag_spec\""
|
||||||
fi
|
fi
|
||||||
libs="-lfreetype @LIBZ@ @FT2_EXTRA_LIBS@"
|
libs="-lfreetype @LIBZ@ @FT2_EXTRA_LIBS@"
|
||||||
if test "$libdir" != "/usr/lib" && test "$libdir" != "/usr/lib64"; then
|
if test "${SYSROOT}$libdir" != "/usr/lib" && test "${SYSROOT}$libdir" != "/usr/lib64"; then
|
||||||
echo -L$libdir $rpath $libs
|
echo -L${SYSROOT}$libdir $libs
|
||||||
else
|
else
|
||||||
echo $libs
|
echo $libs
|
||||||
fi
|
fi
|
||||||
|
@ -154,7 +154,7 @@ fi
|
||||||
|
|
||||||
if test "$echo_libtool" = "yes" ; then
|
if test "$echo_libtool" = "yes" ; then
|
||||||
convlib="libfreetype.la"
|
convlib="libfreetype.la"
|
||||||
echo $libdir/$convlib
|
echo ${SYSROOT}$libdir/$convlib
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# EOF
|
# EOF
|
||||||
|
|
Loading…
Reference in New Issue