commit - 9c84a04f9cf948abc9d1c94e37a25a1f857b77b1
commit + 8c9b8f487e9efd3eab489d205fd55d97da34a6c3
blob - 7f1889d8b8ca99dbcff7bef3b7d1d3e682bbce07
blob + 016ae560dd45e22d64eb09edb1faedbde63e0be7
--- configure
+++ configure
INSTALL="install"
-add_cflags() {
- CFLAGS="${CFLAGS} $(pkg-config --cflags "$1")"
+add_library() {
+ if pkg-config "$1"; then
+ CFLAGS="${CFLAGS} $(pkg-config --cflags "$1")"
+ LDFLAGS="${LDFLAGS} $(pkg-config --libs "$1")"
+ fi
}
-add_ldflags() {
- LDFLAGS="${LDFLAGS} $(pkg-config --libs "$1")"
-}
-
# try to auto detect CFLAGS and LDFLAGS
if which pkg-config 2>/dev/null 1>&2; then
- if pkg-config libtls; then
- add_cflags "libtls"
- add_ldflags "libtls"
- fi
-
- if pkg-config openssl; then
- add_cflags "openssl"
- add_ldflags "openssl"
- fi
+ add_library "libtls"
+ add_library "openssl"
case "$(uname)" in
OpenBSD)
# use libevent and imsg in base
;;
*)
- if pkg-config libevent; then
- add_cflags "libevent"
- add_ldflags "libevent"
- fi
-
- if pkg-config libimsg; then
- add_cflags "libimsg"
- add_ldflags "libimsg"
- fi
+ add_library "libevent"
+ add_library "libimsg"
;;
esac
*BSD|DragonFly|Darwin)
;;
*)
- if pkg-config libbsd-ctor libbsd-overlay; then
- add_cflags "libbsd-ctor libbsd-overlay"
- add_ldflags "libbsd-ctor libbsd-overlay"
- fi
+ add_library "libbsd-ctor libbsd-overlay"
;;
esac
fi