Changeset 69aaf14 for configure


Ignore:
Timestamp:
2008-04-02T15:40:33Z (16 years ago)
Author:
Jelmer Vernooij <jelmer@…>
Branches:
master
Children:
6ff51ff
Parents:
fa75134 (diff), 5f5d433 (diff), 5be87b2 (diff), 4af7b4f (diff), f1e7407 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge several portability improvements.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • configure

    rfa75134 r69aaf14  
    7474--ssl=...       SSL library to use (gnutls, nss, openssl, bogus, auto)
    7575                                                        $ssl
     76
     77--target=...    Cross compilation target                same as host
    7678EOF
    7779                exit;
     
    132134EOF
    133135
     136if [ -n "$target" ]; then
     137        PKG_CONFIG_PATH=/usr/$target/lib/pkgconfig
     138        PATH=/usr/$target/bin:$PATH
     139        CC=$target-cc
     140        LD=$target-ld
     141fi
     142
    134143if [ "$debug" = "1" ]; then
    135144        [ -z "$CFLAGS" ] && CFLAGS=-g
     
    158167echo "CC=$CC" >> Makefile.settings;
    159168
    160 if [ -n "$LD" ]; then
    161         echo "LD=$LD" >> Makefile.settings;
    162 elif type ld > /dev/null 2> /dev/null; then
    163         echo "LD=ld" >> Makefile.settings;
    164 else
    165         echo 'Cannot find ld, aborting.'
    166         exit 1;
    167 fi
     169if [ -z "$LD" ]; then
     170        if type ld > /dev/null 2> /dev/null; then
     171                LD=ld
     172        else
     173                echo 'Cannot find ld, aborting.'
     174                exit 1;
     175        fi
     176fi
     177
     178echo "LD=$LD" >> Makefile.settings
    168179
    169180if [ -z "$PKG_CONFIG" ]; then
     
    213224detect_gnutls()
    214225{
    215         if libgnutls-config --version > /dev/null 2> /dev/null; then
     226        if $PKG_CONFIG --exists gnutls; then
     227                cat <<EOF>>Makefile.settings
     228EFLAGS+=`$PKG_CONFIG --libs gnutls`
     229CFLAGS+=`$PKG_CONFIG --cflags gnutls`
     230EOF
     231                ssl=gnutls
     232                ret=1
     233        elif libgnutls-config --version > /dev/null 2> /dev/null; then
    216234                cat <<EOF>>Makefile.settings
    217235EFLAGS+=`libgnutls-config --libs`
     
    489507esac
    490508
     509if [ -n "$target" ]; then
     510        echo "Cross-compiling for: $target"
     511fi
     512
    491513echo
    492514echo 'Configuration done:'
Note: See TracChangeset for help on using the changeset viewer.