Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
0a06ca29
Commit
0a06ca29
authored
Jul 31, 2013
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
configure: Don't use the alternate package config scripts when cross-compiling.
parent
b48ee748
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
16 additions
and
16 deletions
+16
-16
aclocal.m4
aclocal.m4
+2
-2
configure
configure
+14
-14
No files found.
aclocal.m4
View file @
0a06ca29
...
...
@@ -92,12 +92,12 @@ AC_ARG_VAR(ac_cflags, [C compiler flags for $2, overriding pkg-config])dnl
AS_IF([test -n "$ac_cflags"],[],
[test -n "$PKG_CONFIG"],
[ac_cflags=`$PKG_CONFIG --cflags [$2] 2>/dev/null`])
m4_ifval([$4],[ac_cflags=[$]{ac_cflags:-[$4]}])
m4_ifval([$4],[
test "$cross_compiling" = yes ||
ac_cflags=[$]{ac_cflags:-[$4]}])
AC_ARG_VAR(ac_libs, [Linker flags for $2, overriding pkg-config])dnl
AS_IF([test -n "$ac_libs"],[],
[test -n "$PKG_CONFIG"],
[ac_libs=`$PKG_CONFIG --libs [$2] 2>/dev/null`])
m4_ifval([$5],[ac_libs=[$]{ac_libs:-[$5]}])
m4_ifval([$5],[
test "$cross_compiling" = yes ||
ac_libs=[$]{ac_libs:-[$5]}])
m4_ifval([$3],[ac_libs=[$]{ac_libs:-"$3"}])
ac_save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $ac_cflags"
...
...
configure
View file @
0a06ca29
...
...
@@ -9593,13 +9593,13 @@ then
elif
test
-n
"
$PKG_CONFIG
"
;
then
:
XML2_CFLAGS
=
`
$PKG_CONFIG
--cflags
libxml-2.0 2>/dev/null
`
fi
XML2_CFLAGS
=
${
XML2_CFLAGS
:-
`
xml2-config
--cflags
2>/dev/null
`
}
test
"
$cross_compiling
"
=
yes
||
XML2_CFLAGS
=
${
XML2_CFLAGS
:-
`
xml2-config
--cflags
2>/dev/null
`
}
if
test
-n
"
$XML2_LIBS
"
;
then
:
elif
test
-n
"
$PKG_CONFIG
"
;
then
:
XML2_LIBS
=
`
$PKG_CONFIG
--libs
libxml-2.0 2>/dev/null
`
fi
XML2_LIBS
=
${
XML2_LIBS
:-
`
xml2-config
--libs
2>/dev/null
`
}
test
"
$cross_compiling
"
=
yes
||
XML2_LIBS
=
${
XML2_LIBS
:-
`
xml2-config
--libs
2>/dev/null
`
}
XML2_LIBS
=
${
XML2_LIBS
:-
"-lxml2"
}
ac_save_CPPFLAGS
=
$CPPFLAGS
CPPFLAGS
=
"
$CPPFLAGS
$XML2_CFLAGS
"
...
...
@@ -9905,13 +9905,13 @@ then
elif
test
-n
"
$PKG_CONFIG
"
;
then
:
XSLT_CFLAGS
=
`
$PKG_CONFIG
--cflags
libxslt 2>/dev/null
`
fi
XSLT_CFLAGS
=
${
XSLT_CFLAGS
:-
`
xslt-config
--cflags
2>/dev/null
`
}
test
"
$cross_compiling
"
=
yes
||
XSLT_CFLAGS
=
${
XSLT_CFLAGS
:-
`
xslt-config
--cflags
2>/dev/null
`
}
if
test
-n
"
$XSLT_LIBS
"
;
then
:
elif
test
-n
"
$PKG_CONFIG
"
;
then
:
XSLT_LIBS
=
`
$PKG_CONFIG
--libs
libxslt 2>/dev/null
`
fi
XSLT_LIBS
=
${
XSLT_LIBS
:-
`
xslt-config
--libs
2>/dev/null
`
}
test
"
$cross_compiling
"
=
yes
||
XSLT_LIBS
=
${
XSLT_LIBS
:-
`
xslt-config
--libs
2>/dev/null
`
}
XSLT_LIBS
=
${
XSLT_LIBS
:-
"-lxml2"
}
ac_save_CPPFLAGS
=
$CPPFLAGS
CPPFLAGS
=
"
$CPPFLAGS
$XSLT_CFLAGS
"
...
...
@@ -10435,13 +10435,13 @@ then
elif
test
-n
"
$PKG_CONFIG
"
;
then
:
SANE_CFLAGS
=
`
$PKG_CONFIG
--cflags
libsane 2>/dev/null
`
fi
SANE_CFLAGS
=
${
SANE_CFLAGS
:-
`
sane-config
--cflags
2>/dev/null
`
}
test
"
$cross_compiling
"
=
yes
||
SANE_CFLAGS
=
${
SANE_CFLAGS
:-
`
sane-config
--cflags
2>/dev/null
`
}
if
test
-n
"
$SANE_LIBS
"
;
then
:
elif
test
-n
"
$PKG_CONFIG
"
;
then
:
SANE_LIBS
=
`
$PKG_CONFIG
--libs
libsane 2>/dev/null
`
fi
SANE_LIBS
=
${
SANE_LIBS
:-
`
sane-config
--ldflags
2>/dev/null
`
}
test
"
$cross_compiling
"
=
yes
||
SANE_LIBS
=
${
SANE_LIBS
:-
`
sane-config
--ldflags
2>/dev/null
`
}
ac_save_CPPFLAGS
=
$CPPFLAGS
CPPFLAGS
=
"
$CPPFLAGS
$SANE_CFLAGS
"
...
...
@@ -10591,13 +10591,13 @@ then
elif
test
-n
"
$PKG_CONFIG
"
;
then
:
GPHOTO2_CFLAGS
=
`
$PKG_CONFIG
--cflags
libgphoto2 2>/dev/null
`
fi
GPHOTO2_CFLAGS
=
${
GPHOTO2_CFLAGS
:-
`
gphoto2-config
--cflags
2>/dev/null
`
}
test
"
$cross_compiling
"
=
yes
||
GPHOTO2_CFLAGS
=
${
GPHOTO2_CFLAGS
:-
`
gphoto2-config
--cflags
2>/dev/null
`
}
if
test
-n
"
$GPHOTO2_LIBS
"
;
then
:
elif
test
-n
"
$PKG_CONFIG
"
;
then
:
GPHOTO2_LIBS
=
`
$PKG_CONFIG
--libs
libgphoto2 2>/dev/null
`
fi
GPHOTO2_LIBS
=
${
GPHOTO2_LIBS
:-
`
gphoto2-config
--libs
2>/dev/null
`
}
test
"
$cross_compiling
"
=
yes
||
GPHOTO2_LIBS
=
${
GPHOTO2_LIBS
:-
`
gphoto2-config
--libs
2>/dev/null
`
}
GPHOTO2_LIBS
=
${
GPHOTO2_LIBS
:-
"-lgphoto2"
}
ac_save_CPPFLAGS
=
$CPPFLAGS
CPPFLAGS
=
"
$CPPFLAGS
$GPHOTO2_CFLAGS
"
...
...
@@ -10661,13 +10661,13 @@ test -z "$GPHOTO2_LIBS" || GPHOTO2_LIBS=`echo " $GPHOTO2_LIBS" | sed 's/ -L\([^/
elif
test
-n
"
$PKG_CONFIG
"
;
then
:
GPHOTO2_PORT_CFLAGS
=
`
$PKG_CONFIG
--cflags
libgphoto2_port 2>/dev/null
`
fi
GPHOTO2_PORT_CFLAGS
=
${
GPHOTO2_PORT_CFLAGS
:-
`
gphoto2-port-config
--cflags
2>/dev/null
`
}
test
"
$cross_compiling
"
=
yes
||
GPHOTO2_PORT_CFLAGS
=
${
GPHOTO2_PORT_CFLAGS
:-
`
gphoto2-port-config
--cflags
2>/dev/null
`
}
if
test
-n
"
$GPHOTO2_PORT_LIBS
"
;
then
:
elif
test
-n
"
$PKG_CONFIG
"
;
then
:
GPHOTO2_PORT_LIBS
=
`
$PKG_CONFIG
--libs
libgphoto2_port 2>/dev/null
`
fi
GPHOTO2_PORT_LIBS
=
${
GPHOTO2_PORT_LIBS
:-
`
gphoto2-port-config
--libs
2>/dev/null
`
}
test
"
$cross_compiling
"
=
yes
||
GPHOTO2_PORT_LIBS
=
${
GPHOTO2_PORT_LIBS
:-
`
gphoto2-port-config
--libs
2>/dev/null
`
}
GPHOTO2_PORT_LIBS
=
${
GPHOTO2_PORT_LIBS
:-
"-lgphoto2_port"
}
ac_save_CPPFLAGS
=
$CPPFLAGS
CPPFLAGS
=
"
$CPPFLAGS
$GPHOTO2_PORT_CFLAGS
"
...
...
@@ -10881,13 +10881,13 @@ then
elif
test
-n
"
$PKG_CONFIG
"
;
then
:
FREETYPE_CFLAGS
=
`
$PKG_CONFIG
--cflags
freetype2 2>/dev/null
`
fi
FREETYPE_CFLAGS
=
${
FREETYPE_CFLAGS
:-
`
(
freetype-config
--cflags
||
freetype2-config
--cflags
)
2>/dev/null
`
}
test
"
$cross_compiling
"
=
yes
||
FREETYPE_CFLAGS
=
${
FREETYPE_CFLAGS
:-
`
(
freetype-config
--cflags
||
freetype2-config
--cflags
)
2>/dev/null
`
}
if
test
-n
"
$FREETYPE_LIBS
"
;
then
:
elif
test
-n
"
$PKG_CONFIG
"
;
then
:
FREETYPE_LIBS
=
`
$PKG_CONFIG
--libs
freetype2 2>/dev/null
`
fi
FREETYPE_LIBS
=
${
FREETYPE_LIBS
:-
`
(
freetype-config
--libs
||
freetype2-config
--libs
)
2>/dev/null
`
}
test
"
$cross_compiling
"
=
yes
||
FREETYPE_LIBS
=
${
FREETYPE_LIBS
:-
`
(
freetype-config
--libs
||
freetype2-config
--libs
)
2>/dev/null
`
}
FREETYPE_LIBS
=
${
FREETYPE_LIBS
:-
"-lfreetype"
}
ac_save_CPPFLAGS
=
$CPPFLAGS
CPPFLAGS
=
"
$CPPFLAGS
$FREETYPE_CFLAGS
"
...
...
@@ -11941,13 +11941,13 @@ then
elif
test
-n
"
$PKG_CONFIG
"
;
then
:
PNG_CFLAGS
=
`
$PKG_CONFIG
--cflags
libpng 2>/dev/null
`
fi
PNG_CFLAGS
=
${
PNG_CFLAGS
:-
$X_CFLAGS
}
test
"
$cross_compiling
"
=
yes
||
PNG_CFLAGS
=
${
PNG_CFLAGS
:-
$X_CFLAGS
}
if
test
-n
"
$PNG_LIBS
"
;
then
:
elif
test
-n
"
$PKG_CONFIG
"
;
then
:
PNG_LIBS
=
`
$PKG_CONFIG
--libs
libpng 2>/dev/null
`
fi
PNG_LIBS
=
${
PNG_LIBS
:-
$X_LIBS
}
test
"
$cross_compiling
"
=
yes
||
PNG_LIBS
=
${
PNG_LIBS
:-
$X_LIBS
}
ac_save_CPPFLAGS
=
$CPPFLAGS
CPPFLAGS
=
"
$CPPFLAGS
$PNG_CFLAGS
"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment