Changes in configure [4af7b4f:f1e7407]
Legend:
- Unmodified
- Added
- Removed
-
configure
r4af7b4f rf1e7407 74 74 --ssl=... SSL library to use (gnutls, nss, openssl, bogus, auto) 75 75 $ssl 76 77 --target=... Cross compilation target same as host 76 78 EOF 77 79 exit; … … 132 134 EOF 133 135 136 if [ -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 141 fi 142 134 143 if [ "$debug" = "1" ]; then 135 144 [ -z "$CFLAGS" ] && CFLAGS=-g … … 158 167 echo "CC=$CC" >> Makefile.settings; 159 168 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 169 if [ -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 176 fi 177 178 echo "LD=$LD" >> Makefile.settings 168 179 169 180 if [ -z "$PKG_CONFIG" ]; then … … 213 224 detect_gnutls() 214 225 { 215 if $PKG_CONFIG --exists gnutls; then 216 cat <<EOF>>Makefile.settings 217 EFLAGS+=`$PKG_CONFIG --libs gnutls` 218 CFLAGS+=`$PKG_CONFIG --cflags gnutls` 219 EOF 220 ssl=gnutls 221 ret=1 222 elif libgnutls-config --version > /dev/null 2> /dev/null; then 226 if libgnutls-config --version > /dev/null 2> /dev/null; then 223 227 cat <<EOF>>Makefile.settings 224 228 EFLAGS+=`libgnutls-config --libs` … … 496 500 esac 497 501 502 if [ -n "$target" ]; then 503 echo "Cross-compiling for: $target" 504 fi 505 498 506 echo 499 507 echo 'Configuration done:'
Note: See TracChangeset
for help on using the changeset viewer.