Changeset e08e53c


Ignore:
Timestamp:
2010-01-04T12:16:18Z (14 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
fb020ac
Parents:
a19ea7a
Message:

Fixed build system: Run pkg-config at configure-time instead of just failing
mysteriously at build time if libpurple-dev is missing.

Files:
2 edited

Legend:

Unmodified
Added
Removed

  • configure

    ra19ea7a re08e53c  
    453453        echo '#undef WITH_PURPLE' >> config.h
    454454else
     455        if ! $PKG_CONFIG purple; then
     456                echo
     457                echo 'Cannot find libpurple development libraries, aborting. (Install libpurple-dev?)'
     458                exit 1
     459        fi
    455460        echo '#define WITH_PURPLE' >> config.h
    456         echo 'EFLAGS += $$(pkg-config purple --libs)' >> Makefile.settings
     461        cat<<EOF>>Makefile.settings
     462EFLAGS += $($PKG_CONFIG purple --libs)
     463PURPLE_CFLAGS += $($PKG_CONFIG purple --cflags)
     464EOF
    457465        protocols=$protocols'purple '
    458466        protoobjs=$protoobjs'purple_mod.o '

  • protocols/purple/Makefile

    ra19ea7a re08e53c  
    1212objects = purple.o
    1313
    14 CFLAGS += -Wall $$(pkg-config purple --cflags)
     14CFLAGS += -Wall $(PURPLE_CFLAGS)
    1515LFLAGS += -r
    1616
Note: See TracChangeset for help on using the changeset viewer.