aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xconfigure10
-rw-r--r--protocols/purple/Makefile2
2 files changed, 10 insertions, 2 deletions
diff --git a/configure b/configure
index a87b3697..b7f9a464 100755
--- a/configure
+++ b/configure
@@ -452,8 +452,16 @@ protoobjs=''
if [ "$purple" = 0 ]; then
echo '#undef WITH_PURPLE' >> config.h
else
+ if ! $PKG_CONFIG purple; then
+ echo
+ echo 'Cannot find libpurple development libraries, aborting. (Install libpurple-dev?)'
+ exit 1
+ fi
echo '#define WITH_PURPLE' >> config.h
- echo 'EFLAGS += $$(pkg-config purple --libs)' >> Makefile.settings
+ cat<<EOF>>Makefile.settings
+EFLAGS += $($PKG_CONFIG purple --libs)
+PURPLE_CFLAGS += $($PKG_CONFIG purple --cflags)
+EOF
protocols=$protocols'purple '
protoobjs=$protoobjs'purple_mod.o '
diff --git a/protocols/purple/Makefile b/protocols/purple/Makefile
index bdefbd5f..15460529 100644
--- a/protocols/purple/Makefile
+++ b/protocols/purple/Makefile
@@ -11,7 +11,7 @@
# [SH] Program variables
objects = purple.o
-CFLAGS += -Wall $$(pkg-config purple --cflags)
+CFLAGS += -Wall $(PURPLE_CFLAGS)
LFLAGS += -r
# [SH] Phony targets