blob: 748c88d9fc6eba2c65f9eecf5952e0faecc97b98 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
|
Index: mythtv/configure
===================================================================
--- mythtv/configure (revision 22430)
+++ mythtv/configure (working copy)
@@ -919,27 +919,27 @@
#deprecated, use check_lib or check_lib2 instead
has_library()
{
- if test -f /etc/ld.so.conf ; then
- LIBPATHS=`cat /etc/ld.so.conf | grep -v "#" | grep -v "include"`
- else
- LIBPATHS=''
- fi
+ LIBPATHS=''
+ if test "x${sysroot}" = "x" ; then
+ if test -f /etc/ld.so.conf ; then
+ LIBPATHS=`cat /etc/ld.so.conf | grep -v "#" | grep -v "include"`
+ fi
+ LIBPATHS="$LIBPATHS `echo $LD_LIBRARY_PATH | sed s/':'/' '/g` "
+ # Mac OS X has a different variable for this:
+ LIBPATHS="$LIBPATHS `echo $DYLD_LIBRARY_PATH | sed s/':'/' '/g` "
- LIBPATHS="$LIBPATHS `echo $LD_LIBRARY_PATH | sed s/':'/' '/g` "
- # Mac OS X has a different variable for this:
- LIBPATHS="$LIBPATHS `echo $DYLD_LIBRARY_PATH | sed s/':'/' '/g` "
-
- # recurse down just one level, should be enough in most cases
- if test -f /etc/ld.so.conf ; then
- INCL=`cat /etc/ld.so.conf | grep -v "#" | grep "^include"`
- SRCH=`echo "$INCL" | sed '{ s/^include \//\//; s/^include /\/etc\//}'`
- for x in $SRCH ; do
- LP_APPEND=`cat $x | grep -v "#" | grep -v "^include"`
- LIBPATHS="$LIBPATHS $LP_APPEND"
- done
+ # recurse down just one level, should be enough in most cases
+ if test -f /etc/ld.so.conf ; then
+ INCL=`cat /etc/ld.so.conf | grep -v "#" | grep "^include"`
+ SRCH=`echo "$INCL" | sed '{ s/^include \//\//; s/^include /\/etc\//}'`
+ for x in $SRCH ; do
+ LP_APPEND=`cat $x | grep -v "#" | grep -v "^include"`
+ LIBPATHS="$LIBPATHS $LP_APPEND"
+ done
+ fi
fi
- LIBPATHS="`echo $LIBPATHS /$libdir_name /usr/$libdir_name /usr/local/$libdir_name /usr/X11R6/$libdir_name | sed s/'\/ '/' '/g` "
+ LIBPATHS="`echo $LIBPATHS $sysroot/$libdir_name $sysroot/usr/$libdir_name $sysroot/usr/local/$libdir_name $sysroot/usr/X11R6/$libdir_name | sed s/'\/ '/' '/g` "
HAS_IT="no"
for LIBPATH in $LIBPATHS ; do
@@ -4252,8 +4252,8 @@
# -L from early in the link line, to ignore any old installed libmyth*
# Note: Qt uses QMAKE_INCDIR_QT to build an absolute path for include
# directories, it cannot be modified.
-QMAKE_LIBDIR_QT -= $libdir
-LATE_LIBS += -L$libdir
+QMAKE_LIBDIR_QT -= ${sysroot}${libdir}
+LATE_LIBS += -L${sysroot}${libdir}
EOF
diff $TMPH $MYTH_CONFIG_H >/dev/null 2>&1
|
