Commit Diff

Commit:
d336aeafd4b848f3d6f3711e8d233d8b75ce297b
From:
Omar Polo <op@omarpolo.com>
Date:
Message:
refactor add_{cflags,ldflags}
Actions:
Patch | Tree
commit - 489e1655a0be43f6cca08030e558a03824627c9e
commit + d336aeafd4b848f3d6f3711e8d233d8b75ce297b
blob - 6453fa8e9a14dd881331b25b75a1ea3e2237f2ce
blob + ce0b7a37af0a0394a3ad3ee552834e1fc6fff4c3
--- configure
+++ configure
@@ -62,23 +62,23 @@ BINDIR=
 INSTALL="install"
 
 add_cflags() {
-	CFLAGS="${CFLAGS} $1"
+	CFLAGS="${CFLAGS} $(pkg-config --cflags "$1")"
 }
 
 add_ldflags() {
-	LDFLAGS="${LDFLAGS} $1"
+	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 "$(pkg-config --cflags libtls)"
-		add_ldflags "$(pkg-config --libs libtls)"
+		add_cflags "libtls"
+		add_ldflags "libtls"
 	fi
 
 	if pkg-config openssl; then
-		add_cflags "$(pkg-config --cflags openssl)"
-		add_ldflags "$(pkg-config --libs openssl)"
+		add_cflags "openssl"
+		add_ldflags "openssl"
 	fi
 
 	case "$(uname)" in
@@ -87,13 +87,13 @@ if which pkg-config 2>/dev/null 1>&2; then
 			;;
 		*)
 			if pkg-config libevent; then
-				add_cflags "$(pkg-config --cflags libevent)"
-				add_ldflags "$(pkg-config --libs libevent)"
+				add_cflags "libevent"
+				add_ldflags "libevent"
 			fi
 
 			if pkg-config libimsg; then
-				add_cflags "$(pkg-config --cflags libimsg)"
-				add_ldflags "$(pkg-config --libs libimsg)"
+				add_cflags "libimsg"
+				add_ldflags "libimsg"
 			fi
 			;;
 	esac