kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #127 from Keruspe/master 

configure: don't hardcode pkg-config
master
Harald Hoyer 2016-05-04 11:13:54 +02:00
parent ab4cccf2a7 699414f5a5
commit a365b67db0
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure vendored
View File

@ -7,6 +7,8 @@ prefix=/usr


enable_documentation=yes enable_documentation=yes


PKG_CONFIG="${PKG_CONFIG:-pkg-config}"

# Little helper function for reading args from the commandline. # Little helper function for reading args from the commandline.
# it automatically handles -a b and -a=b variants, and returns 1 if # it automatically handles -a b and -a=b variants, and returns 1 if
# we need to shift $3. # we need to shift $3.
@ -50,7 +52,7 @@ while (($# > 0)); do
shift shift
done done


if ! pkg-config --exists --print-errors " libkmod >= 15 "; then if ! ${PKG_CONFIG} --exists --print-errors " libkmod >= 15 "; then
echo "dracut needs pkg-config and libkmod >= 15." >&2 echo "dracut needs pkg-config and libkmod >= 15." >&2
exit 1 exit 1
fi fi
@ -64,8 +66,8 @@ sbindir ?= ${sbindir:-${prefix}/sbin}
mandir ?= ${mandir:-${prefix}/share/man} mandir ?= ${mandir:-${prefix}/share/man}
enable_documentation ?= ${enable_documentation:-yes} enable_documentation ?= ${enable_documentation:-yes}
bindir ?= ${bindir:-${prefix}/bin} bindir ?= ${bindir:-${prefix}/bin}
KMOD_CFLAGS ?= $(pkg-config --cflags " libkmod >= 15 ") KMOD_CFLAGS ?= $(${PKG_CONFIG} --cflags " libkmod >= 15 ")
KMOD_LIBS ?= $(pkg-config --libs " libkmod >= 15 ") KMOD_LIBS ?= $(${PKG_CONFIG} --libs " libkmod >= 15 ")
EOF EOF


{ {