diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2010-01-04 12:16:18 +0000 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2010-01-04 12:16:18 +0000 |
| commit | e08e53c9398700309000c6e6b7ff895185d567a9 (patch) | |
| tree | 0f9b545f37fed519fcd82748de1b6f602814ae36 | |
| parent | a19ea7a21e082d0e28aea7198bea0f3bd3e2eb4f (diff) | |
Fixed build system: Run pkg-config at configure-time instead of just failing
mysteriously at build time if libpurple-dev is missing.
| -rwxr-xr-x | configure | 10 | ||||
| -rw-r--r-- | protocols/purple/Makefile | 2 |
2 files changed, 10 insertions, 2 deletions
@@ -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 |