From 0e25c51363d505e77dfda79c595dad5284e179ed Mon Sep 17 00:00:00 2001
From: Fons Rademakers <Fons.Rademakers@cern.ch>
Date: Mon, 20 Sep 2004 14:09:19 +0000
Subject: [PATCH] on MacOS X add -lfreetype to the library list of --libs and
--glibs. When the ROOT binary directory is relocated the freetype lib linked
to libGraf is not found during linking, so we need to explicitely add it
again.
git-svn-id: http://root.cern.ch/svn/root/trunk@10102 27541ba8-7e3a-0410-8455-c3a389f83636
---
config/root-config.in | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/config/root-config.in b/config/root-config.in
index 974e2c7988e..5b09ef04605 100755
--- a/config/root-config.in
+++ b/config/root-config.in
@@ -257,6 +257,8 @@ macosx)
finkdir=`which fink 2>&1 | sed -ne "s/\/bin\/fink//p"`
auxcflags=`[ -d ${finkdir}/include ] && echo -I${finkdir}/include`
auxlibs="-lm `[ -d ${finkdir}/lib ] && echo -L${finkdir}/lib` -ldl"
+ # cannot find the one linked to libGraf if relocated after built
+ rootlibs="$rootlibs -lfreetype"
if [ $macosx_minor -le 3 ]; then
forcelibs=$rootulibs
forceglibs=$rootuglibs
@@ -268,6 +270,8 @@ macosxxlc)
finkdir=`which fink 2>&1 | sed -ne "s/\/bin\/fink//p"`
auxcflags=`[ -d ${finkdir}/include ] && echo -I${finkdir}/include`
auxlibs="-lm `[ -d ${finkdir}/lib ] && echo -L${finkdir}/lib` -ldl"
+ # cannot find the one linked to libGraf if relocated after built
+ rootlibs="$rootlibs -lfreetype"
if [ $macosx_minor -le 3 ]; then
forcelibs=$rootulibs
forceglibs=$rootuglibs
@@ -527,9 +531,10 @@ while test $# -gt 0; do
fi
;;
--glibs)
- ### Output graphics an normal libraries
+ ### Output graphics and normal libraries
### If the user said --libs --glibs, we don't need to add the
### regular ROOT libraries.
+ glibsonly="no"
if test "x$libsout" = "xno" ; then
### Set the flag
libsout="yes"
@@ -538,6 +543,9 @@ while test $# -gt 0; do
else
glibs="${rootlibs} ${rootglibs}"
fi
+ else
+ glibs="${rootglibs}"
+ glibsonly="yes"
fi
### If we're on a win32 system, we need to change the -l prefix
### into a .lib suffix, and expand the paths to a backslash
@@ -553,10 +561,14 @@ while test $# -gt 0; do
out="$out -L${libdir}"
fi
fi
- if test "x$noauxlibs" = "xyes" ; then
- out="$out $forcelibs $forceglibs $glibs"
+ if test "x$glibsonly" = "xyes" ; then
+ out="$out $forceglibs $glibs"
else
- out="$out $forcelibs $forceglibs $glibs ${auxlibs}"
+ if test "x$noauxlibs" = "xyes" ; then
+ out="$out $forcelibs $forceglibs $glibs"
+ else
+ out="$out $forcelibs $forceglibs $glibs ${auxlibs}"
+ fi
fi
;;
--auxlibs)
--
GitLab