Revision 0c439cbf configure

b/configure
224 224
case $targetos in
225 225
CYGWIN*)
226 226
mingw32="yes"
227
OS_CFLAGS="-mno-cygwin"
227
CFLAGS="-mno-cygwin $CFLAGS"
228 228
if [ "$cpu" = "i386" ] ; then
229 229
    kqemu="yes"
230 230
fi
......
282 282
    [ "$is_x86_64" = "1" ] && cpu=x86_64
283 283
fi
284 284
if [ "$cpu" = "x86_64" ] ; then
285
    OS_CFLAGS="-arch x86_64"
286
    LDFLAGS="-arch x86_64"
285
    CFLAGS="-arch x86_64 $CFLAGS"
286
    LDFLAGS="-arch x86_64 $LDFLAGS"
287 287
else
288
    OS_CFLAGS="-mdynamic-no-pic"
288
    CFLAGS="-mdynamic-no-pic $CFLAGS"
289 289
fi
290 290
darwin_user="yes"
291 291
cocoa="yes"
292 292
audio_drv_list="coreaudio"
293 293
audio_possible_drivers="coreaudio sdl fmod"
294
OS_LDFLAGS="-framework CoreFoundation -framework IOKit"
294
LDFLAGS="-framework CoreFoundation -framework IOKit $LDFLAGS"
295 295
;;
296 296
SunOS)
297 297
    solaris="yes"
......
325 325
        audio_drv_list="oss"
326 326
    fi
327 327
    audio_possible_drivers="oss sdl"
328
    OS_CFLAGS=-std=gnu99
328
    CFLAGS="-std=gnu99 $CFLAGS"
329 329
;;
330 330
AIX)
331 331
aix="yes"
......
479 479
      sparc_cpu="$optarg"
480 480
      case $sparc_cpu in
481 481
        v7|v8)
482
          ARCH_CFLAGS="-m32 -mcpu=${sparc_cpu} -D__sparc_${sparc_cpu}__"
483
          ARCH_LDFLAGS="-m32"
482
          CFLAGS="-m32 -mcpu=${sparc_cpu} -D__sparc_${sparc_cpu}__ $CFLAGS"
483
          LDFLAGS="-m32 $LDFLAGS"
484 484
          cpu="sparc"
485 485
        ;;
486 486
        v8plus|v8plusa)
487
          ARCH_CFLAGS="-m32 -mcpu=ultrasparc -D__sparc_${sparc_cpu}__"
488
          ARCH_LDFLAGS="-m32"
487
          CFLAGS="-m32 -mcpu=ultrasparc -D__sparc_${sparc_cpu}__ $CFLAGS"
488
          LDFLAGS="-m32 $LDFLAGS"
489 489
          cpu="sparc"
490 490
        ;;
491 491
        v9)
492
          ARCH_CFLAGS="-m64 -mcpu=ultrasparc -D__sparc_${sparc_cpu}__"
493
          ARCH_LDFLAGS="-m64"
492
          CFLAGS="-m64 -mcpu=ultrasparc -D__sparc_${sparc_cpu}__ $CFLAGS"
493
          LDFLAGS="-m64 $LDFLAGS"
494 494
          cpu="sparc64"
495 495
        ;;
496 496
        *)
......
532 532

  
533 533
#
534 534
# If cpu ~= sparc and  sparc_cpu hasn't been defined, plug in the right
535
# ARCH_CFLAGS/ARCH_LDFLAGS (assume sparc_v8plus for 32-bit and sparc_v9 for 64-bit)
535
# CFLAGS/LDFLAGS (assume sparc_v8plus for 32-bit and sparc_v9 for 64-bit)
536 536
#
537 537
host_guest_base="no"
538 538
case "$cpu" in
539 539
    sparc) if test -z "$sparc_cpu" ; then
540
               ARCH_CFLAGS="-m32 -mcpu=ultrasparc -D__sparc_v8plus__"
541
               ARCH_LDFLAGS="-m32"
540
               CFLAGS="-m32 -mcpu=ultrasparc -D__sparc_v8plus__ $CFLAGS"
541
               LDFLAGS="-m32 $LDFLAGS"
542 542
           fi
543
           ARCH_CFLAGS="$ARCH_CFLAGS -ffixed-g2 -ffixed-g3"
543
           CFLAGS="-ffixed-g2 -ffixed-g3 $CFLAGS"
544 544
           if test "$solaris" = "no" ; then
545
               ARCH_CFLAGS="$ARCH_CFLAGS -ffixed-g1 -ffixed-g6"
545
               CFLAGS="-ffixed-g1 -ffixed-g6 $CFLAGS"
546 546
           fi
547 547
           ;;
548 548
    sparc64) if test -z "$sparc_cpu" ; then
549
               ARCH_CFLAGS="-m64 -mcpu=ultrasparc -D__sparc_v9__"
550
               ARCH_LDFLAGS="-m64"
549
               CFLAGS="-m64 -mcpu=ultrasparc -D__sparc_v9__ $CFLAGS"
550
               LDFLAGS="-m64 $LDFLAGS"
551 551
           fi
552 552
           if test "$solaris" = "no" ; then
553
               ARCH_CFLAGS="$ARCH_CFLAGS -ffixed-g5 -ffixed-g6 -ffixed-g7"
553
               CFLAGS="-ffixed-g5 -ffixed-g6 -ffixed-g7 $CFLAGS"
554 554
           else
555
               ARCH_CFLAGS="$ARCH_CFLAGS -ffixed-g1 -ffixed-g5 -ffixed-g6 -ffixed-g7"
555
               CFLAGS="-ffixed-g1 -ffixed-g5 -ffixed-g6 -ffixed-g7 $CFLAGS"
556 556
           fi
557 557
           ;;
558 558
    s390)
559
           ARCH_CFLAGS="-march=z900"
559
           CFLAGS="-march=z900 $CFLAGS"
560 560
           ;;
561 561
    i386)
562
           ARCH_CFLAGS="-m32"
563
           ARCH_LDFLAGS="-m32"
562
           CFLAGS="-m32 $CFLAGS"
563
           LDFLAGS="-m32 $LDFLAGS"
564 564
           host_guest_base="yes"
565 565
           ;;
566 566
    x86_64)
567
           ARCH_CFLAGS="-m64"
568
           ARCH_LDFLAGS="-m64"
567
           CFLAGS="-m64 $CFLAGS"
568
           LDFLAGS="-m64 $LDFLAGS"
569 569
           host_guest_base="yes"
570 570
           ;;
571 571
    arm*)
......
660 660
    EXESUF=".exe"
661 661
    linux_user="no"
662 662
    bsd_user="no"
663
    OS_CFLAGS="$OS_CFLAGS -DWIN32_LEAN_AND_MEAN -DWINVER=0x501"
663
    CFLAGS="-DWIN32_LEAN_AND_MEAN -DWINVER=0x501 $CFLAGS"
664 664
fi
665 665

  
666 666
if test ! -x "$(which cgcc 2>/dev/null)"; then
......
774 774
}
775 775
EOF
776 776

  
777
if $cc $ARCH_CFLAGS -o $TMPE $TMPC > /dev/null 2> /dev/null ; then
777
if $cc $CFLAGS -o $TMPE $TMPC > /dev/null 2> /dev/null ; then
778 778
$TMPE && bigendian="yes"
779 779
else
780 780
echo big/little test failed
......
820 820
}
821 821
EOF
822 822

  
823
if $cc $ARCH_CFLAGS -c -o $TMPO $TMPC > /dev/null 2> /dev/null ; then
823
if $cc $CFLAGS -c -o $TMPO $TMPC > /dev/null 2> /dev/null ; then
824 824
  :
825 825
else
826 826
   nptl="no"
......
833 833
#include <zlib.h>
834 834
int main(void) { zlibVersion(); return 0; }
835 835
EOF
836
if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $TMPC -lz > /dev/null 2> /dev/null ; then
836
if $cc $CFLAGS -o $TMPE $TMPC -lz > /dev/null 2> /dev/null ; then
837 837
    :
838 838
else
839 839
    echo
......
853 853
#include <xs.h>
854 854
int main(void) { xs_daemon_open(); xc_interface_open(); return 0; }
855 855
EOF
856
  if $cc $CFLAGS $ARCH_CFLAGS $EXTRA_CFLAGS -c -o $TMPO $TMPC $LDFLAGS $EXTRA_LDFLAGS $xen_libs 2> /dev/null > /dev/null ; then
856
  if $cc $CFLAGS -c -o $TMPO $TMPC $LDFLAGS $xen_libs 2> /dev/null > /dev/null ; then
857 857
    :
858 858
  else
859 859
    xen="no"
......
874 874
EOF
875 875
  sdl_cflags=`sdl-config --cflags 2> /dev/null`
876 876
  sdl_libs=`sdl-config --libs 2> /dev/null`
877
  if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $sdl_cflags $TMPC $sdl_libs > $TMPSDLLOG 2>&1 ; then
877
  if $cc $CFLAGS -o $TMPE $sdl_cflags $TMPC $sdl_libs > $TMPSDLLOG 2>&1 ; then
878 878
    _sdlversion=`sdl-config --version | sed 's/[^0-9]//g'`
879 879
    if test "$_sdlversion" -lt 121 ; then
880 880
      sdl_too_old=yes
......
891 891
         sdl_libs="$sdl_libs `aalib-config --static-libs >2 /dev/null`"
892 892
         sdl_cflags="$sd_cflags `aalib-config --cflags >2 /dev/null`"
893 893
      fi
894
      if $cc -o $TMPE ${OS_CFLAGS} $sdl_cflags $TMPC $sdl_libs > /dev/null 2> /dev/null; then
894
      if $cc -o $TMPE $CFLAGS $sdl_cflags $TMPC $sdl_libs > /dev/null 2> /dev/null; then
895 895
	:
896 896
      else
897 897
        sdl=no
......
910 910
#endif
911 911
int main(void) { return 0; }
912 912
EOF
913
  if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $sdl_cflags $TMPC $sdl_libs > /dev/null 2>&1 ; then
913
  if $cc $CFLAGS -o $TMPE $sdl_cflags $TMPC $sdl_libs > /dev/null 2>&1 ; then
914 914
    sdl_libs="$sdl_libs -lX11"
915 915
  fi
916 916
fi
......
924 924
EOF
925 925
    vnc_tls_cflags=`pkg-config --cflags gnutls 2> /dev/null`
926 926
    vnc_tls_libs=`pkg-config --libs gnutls 2> /dev/null`
927
    if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $vnc_tls_cflags $TMPC \
927
    if $cc $CFLAGS -o $TMPE $vnc_tls_cflags $TMPC \
928 928
           $vnc_tls_libs > /dev/null 2> /dev/null ; then
929 929
	:
930 930
    else
......
943 943
    # Assuming Cyrus-SASL installed in /usr prefix
944 944
    vnc_sasl_cflags=""
945 945
    vnc_sasl_libs="-lsasl2"
946
    if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $vnc_sasl_cflags $TMPC \
946
    if $cc $CFLAGS -o $TMPE $vnc_sasl_cflags $TMPC \
947 947
           $vnc_sasl_libs 2> /dev/null > /dev/null ; then
948 948
	:
949 949
    else
......
962 962
    return 0;
963 963
}
964 964
EOF
965
if $cc $ARCH_CFLAGS -o $TMPE $TMPC > /dev/null 2> /dev/null ; then
965
if $cc $CFLAGS -o $TMPE $TMPC > /dev/null 2> /dev/null ; then
966 966
   fnmatch="yes"
967 967
fi
968 968

  
......
980 980
    return 0;
981 981
}
982 982
EOF
983
  if $cc $ARCH_CFLAGS -o $TMPE $TMPC $vde_libs > /dev/null 2> /dev/null ; then
983
  if $cc $CFLAGS -o $TMPE $TMPC $vde_libs > /dev/null 2> /dev/null ; then
984 984
    vde=yes
985 985
  fi
986 986
fi
......
999 999
#include <$hdr>
1000 1000
int main(void) { $exp }
1001 1001
EOF
1002
    if $cc $ARCH_CFLAGS $cfl -o $TMPE $TMPC $lib > /dev/null 2> /dev/null ; then
1002
    if $cc $CFLAGS $cfl -o $TMPE $TMPC $lib > /dev/null 2> /dev/null ; then
1003 1003
        :
1004 1004
    else
1005 1005
        echo
......
1064 1064
#include <brlapi.h>
1065 1065
int main( void ) { return brlapi__openConnection (NULL, NULL, NULL); }
1066 1066
EOF
1067
  if $cc ${ARCH_CFLAGS} -o $TMPE ${OS_CFLAGS} $TMPC $brlapi_libs > /dev/null 2> /dev/null ; then
1067
  if $cc $CFLAGS -o $TMPE $TMPC $brlapi_libs > /dev/null 2> /dev/null ; then
1068 1068
    brlapi=yes
1069 1069
  fi
1070 1070
fi
......
1080 1080
#endif
1081 1081
int main(void) { resize_term(0, 0); return curses_version(); }
1082 1082
EOF
1083
  if $cc $ARCH_CFLAGS -o $TMPE $TMPC -lncurses > /dev/null 2> /dev/null ; then
1083
  if $cc $CFLAGS -o $TMPE $TMPC -lncurses > /dev/null 2> /dev/null ; then
1084 1084
    curses_libs="-lncurses"
1085
  elif $cc $ARCH_CFLAGS -o $TMPE $TMPC -lcurses > /dev/null 2> /dev/null ; then
1085
  elif $cc $CFLAGS -o $TMPE $TMPC -lcurses > /dev/null 2> /dev/null ; then
1086 1086
    curses_libs="-lcurses"
1087 1087
  else
1088 1088
    curses=no
......
1099 1099
int main(void) { return curl_easy_init(); }
1100 1100
EOF
1101 1101
  curl_libs=`curl-config --libs 2>/dev/null`
1102
 if $cc $ARCH_CFLAGS $curl_libs -o $TMPE $TMPC > /dev/null 2> /dev/null ; then
1102
 if $cc $CFLAGS $curl_libs -o $TMPE $TMPC > /dev/null 2> /dev/null ; then
1103 1103
    curl=yes
1104 1104
  fi
1105 1105
fi # test "$curl"
......
1116 1116
EOF
1117 1117
  bluez_cflags=`pkg-config --cflags bluez 2> /dev/null`
1118 1118
  bluez_libs=`pkg-config --libs bluez 2> /dev/null`
1119
  if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $bluez_cflags $TMPC \
1119
  if $cc $CFLAGS -o $TMPE $bluez_cflags $TMPC \
1120 1120
      $bluez_libs > /dev/null 2> /dev/null ; then
1121 1121
    :
1122 1122
  else
......
1156 1156
  else
1157 1157
      kvm_cflags=""
1158 1158
  fi
1159
  if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $kvm_cflags $TMPC \
1159
  if $cc $CFLAGS -o $TMPE $kvm_cflags $TMPC \
1160 1160
      > /dev/null 2>/dev/null ; then
1161 1161
    :
1162 1162
  else
1163 1163
    kvm="no";
1164 1164
    if [ -x "`which awk 2>/dev/null`" ] && \
1165 1165
       [ -x "`which grep 2>/dev/null`" ]; then
1166
      kvmerr=`LANG=C $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $kvm_cflags $TMPC 2>&1 \
1166
      kvmerr=`LANG=C $cc $CFLAGS -o $TMPE $kvm_cflags $TMPC 2>&1 \
1167 1167
	| grep "error: " \
1168 1168
	| awk -F "error: " '{if (NR>1) printf(", "); printf("%s",$2);}'`
1169 1169
      if test "$kvmerr" != "" ; then
......
1187 1187
int main(void) { pthread_create(0,0,0,0); return 0; }
1188 1188
EOF
1189 1189
  for pthread_lib in $PTHREADLIBS_LIST; do
1190
    if $cc $ARCH_CFLAGS -o $TMPE $TMPC $pthread_lib 2> /dev/null > /dev/null ; then
1190
    if $cc $CFLAGS -o $TMPE $TMPC $pthread_lib 2> /dev/null > /dev/null ; then
1191 1191
      pthread=yes
1192 1192
      PTHREADLIBS="$pthread_lib"
1193 1193
      break
......
1209 1209
int main(void) { struct iovec iov; return 0; }
1210 1210
EOF
1211 1211
iovec=no
1212
if $cc $ARCH_CFLAGS -o $TMPE $TMPC > /dev/null 2> /dev/null ; then
1212
if $cc $CFLAGS -o $TMPE $TMPC > /dev/null 2> /dev/null ; then
1213 1213
  iovec=yes
1214 1214
fi
1215 1215

  
......
1222 1222
int main(void) { preadv; }
1223 1223
EOF
1224 1224
preadv=no
1225
if $cc $ARCH_CFLAGS -o $TMPE $TMPC > /dev/null 2> /dev/null ; then
1225
if $cc $CFLAGS -o $TMPE $TMPC > /dev/null 2> /dev/null ; then
1226 1226
  preadv=yes
1227 1227
fi
1228 1228

  
......
1234 1234
  cat > $TMPC << EOF
1235 1235
int main(void) { return 0; }
1236 1236
EOF
1237
  if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $TMPC $fdt_libs 2> /dev/null > /dev/null ; then
1237
  if $cc $CFLAGS -o $TMPE $TMPC $fdt_libs 2> /dev/null > /dev/null ; then
1238 1238
    fdt=yes
1239 1239
  fi
1240 1240
fi
......
1258 1258
	return (unlinkat(AT_FDCWD, "nonexistent_file", 0));
1259 1259
}
1260 1260
EOF
1261
if $cc $ARCH_CFLAGS -o $TMPE $TMPC 2> /dev/null > /dev/null ; then
1261
if $cc $CFLAGS -o $TMPE $TMPC 2> /dev/null > /dev/null ; then
1262 1262
  atfile=yes
1263 1263
fi
1264 1264

  
......
1278 1278
	return inotify_init();
1279 1279
}
1280 1280
EOF
1281
if $cc $ARCH_CFLAGS -o $TMPE $TMPC 2> /dev/null > /dev/null ; then
1281
if $cc $CFLAGS -o $TMPE $TMPC 2> /dev/null > /dev/null ; then
1282 1282
  inotify=yes
1283 1283
fi
1284 1284

  
......
1297 1297
    return 0;
1298 1298
}
1299 1299
EOF
1300
if $cc $ARCH_CFLAGS -o $TMPE $TMPC 2> /dev/null ; then
1300
if $cc $CFLAGS -o $TMPE $TMPC 2> /dev/null ; then
1301 1301
  utimens=yes
1302 1302
fi
1303 1303

  
......
1315 1315
    return 0;
1316 1316
}
1317 1317
EOF
1318
if $cc $ARCH_CFLAGS -o $TMPE $TMPC 2> /dev/null ; then
1318
if $cc $CFLAGS -o $TMPE $TMPC 2> /dev/null ; then
1319 1319
  pipe2=yes
1320 1320
fi
1321 1321

  
......
1335 1335
    return 0;
1336 1336
}
1337 1337
EOF
1338
if $cc $ARCH_CFLAGS -o $TMPE $TMPC 2> /dev/null ; then
1338
if $cc $CFLAGS -o $TMPE $TMPC 2> /dev/null ; then
1339 1339
  splice=yes
1340 1340
fi
1341 1341

  
......
1350 1350
#include <byteswap.h>
1351 1351
int main(void) { return bswap_32(0); }
1352 1352
EOF
1353
if $cc $ARCH_CFLAGS -o $TMPE $TMPC >/dev/null 2> /dev/null ; then
1353
if $cc $CFLAGS -o $TMPE $TMPC >/dev/null 2> /dev/null ; then
1354 1354
  byteswap_h=yes
1355 1355
fi
1356 1356

  
......
1362 1362
#include <machine/bswap.h>
1363 1363
int main(void) { return bswap32(0); }
1364 1364
EOF
1365
if $cc $ARCH_CFLAGS -o $TMPE $TMPC >/dev/null 2> /dev/null ; then
1365
if $cc $CFLAGS -o $TMPE $TMPC >/dev/null 2> /dev/null ; then
1366 1366
  bswap_h=yes
1367 1367
fi
1368 1368

  
......
1374 1374
int main(void) { clockid_t id; return clock_gettime(id, NULL); }
1375 1375
EOF
1376 1376

  
1377
if $cc $ARCH_CFLAGS -o $TMPE $TMPC > /dev/null 2> /dev/null ; then
1377
if $cc $CFLAGS -o $TMPE $TMPC > /dev/null 2> /dev/null ; then
1378 1378
  CLOCKLIBS=""
1379
elif $cc $ARCH_CFLAGS -o $TMPE $TMPC -lrt > /dev/null 2> /dev/null ; then
1379
elif $cc $CFLAGS -o $TMPE $TMPC -lrt > /dev/null 2> /dev/null ; then
1380 1380
  CLOCKLIBS="-lrt"
1381 1381
fi
1382 1382

  
......
1387 1387
    if test "$2" ; then
1388 1388
	w2=-Wl,$2
1389 1389
    fi
1390
    $cc $ARCH_CFLAGS -o $TMPE $OS_CFLAGS $TMPC -Wl,$1 ${w2} >/dev/null 2>/dev/null
1390
    $cc $CFLAGS -o $TMPE $TMPC -Wl,$1 ${w2} >/dev/null 2>/dev/null
1391 1391
}
1392 1392

  
1393 1393
cat > $TMPC << EOF
......
1472 1472
echo "Source path       $source_path"
1473 1473
echo "C compiler        $cc"
1474 1474
echo "Host C compiler   $host_cc"
1475
echo "ARCH_CFLAGS       $ARCH_CFLAGS"
1475
echo "CFLAGS            $CFLAGS"
1476
echo "LDFLAGS           $LDFLAGS"
1476 1477
echo "make              $make"
1477 1478
echo "install           $install"
1478 1479
echo "host CPU          $cpu"
......
1779 1780
echo "AR=$ar" >> $config_host_mak
1780 1781
echo "OBJCOPY=$objcopy" >> $config_host_mak
1781 1782
echo "LD=$ld" >> $config_host_mak
1782
echo "CFLAGS=$CFLAGS $OS_CFLAGS $ARCH_CFLAGS $EXTRA_CFLAGS" >> $config_host_mak
1783
echo "LDFLAGS=$LDFLAGS $OS_LDFLAGS $ARCH_LDFLAGS $EXTRA_LDFLAGS" >> $config_host_mak
1783
echo "CFLAGS=$CFLAGS $EXTRA_CFLAGS" >> $config_host_mak
1784
echo "LDFLAGS=$LDFLAGS $EXTRA_LDFLAGS" >> $config_host_mak
1784 1785
echo "ARLIBS_BEGIN=$arlibs_begin" >> $config_host_mak
1785 1786
echo "ARLIBS_END=$arlibs_end" >> $config_host_mak
1786 1787
echo "EXESUF=$EXESUF" >> $config_host_mak

Also available in: Unified diff