Changeset 69aaf14 for configure

Timestamp:

2008-04-02T15:40:33Z (17 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:

• configure (modified) (5 diffs)

configure

@@ -74 +74 @@
 --ssl=...       SSL library to use (gnutls, nss, openssl, bogus, auto)
                                                         $ssl
+
+--target=...    Cross compilation target                same as host
 EOF
                 exit;
@@ -132 +134 @@
 EOF
 
+if [ -n "$target" ]; then
+        PKG_CONFIG_PATH=/usr/$target/lib/pkgconfig
+        PATH=/usr/$target/bin:$PATH
+        CC=$target-cc
+        LD=$target-ld
+fi
+
 if [ "$debug" = "1" ]; then
         [ -z "$CFLAGS" ] && CFLAGS=-g
@@ -158 +167 @@
 echo "CC=$CC" >> Makefile.settings;
 
-if [ -n "$LD" ]; then
-        echo "LD=$LD" >> Makefile.settings;
-elif type ld > /dev/null 2> /dev/null; then
-        echo "LD=ld" >> Makefile.settings;
-else
-        echo 'Cannot find ld, aborting.'
-        exit 1;
-fi
+if [ -z "$LD" ]; then
+        if type ld > /dev/null 2> /dev/null; then
+                LD=ld
+        else
+                echo 'Cannot find ld, aborting.'
+                exit 1;
+        fi
+fi
+
+echo "LD=$LD" >> Makefile.settings
 
 if [ -z "$PKG_CONFIG" ]; then
@@ -213 +224 @@
 detect_gnutls()
 {
-        if libgnutls-config --version > /dev/null 2> /dev/null; then
+        if $PKG_CONFIG --exists gnutls; then
+                cat <<EOF>>Makefile.settings
+EFLAGS+=`$PKG_CONFIG --libs gnutls`
+CFLAGS+=`$PKG_CONFIG --cflags gnutls`
+EOF
+                ssl=gnutls
+                ret=1
+        elif libgnutls-config --version > /dev/null 2> /dev/null; then
                 cat <<EOF>>Makefile.settings
 EFLAGS+=`libgnutls-config --libs`
@@ -489 +507 @@
 esac
 
+if [ -n "$target" ]; then
+        echo "Cross-compiling for: $target"
+fi
+
 echo
 echo 'Configuration done:'