Revision 110:125520c3dc05 configure

View differences:

configure
624 624
LIBOBJS
625 625
QMAKE_CONFIG
626 626
HAVES
627
CXXFLAGS_MINIMAL
627
CXXSTANDARD
628 628
CUT
629 629
SHA1SUM
630 630
MAKEDEPEND
......
632 632
PERL
633 633
X11_LIBS
634 634
X11_CFLAGS
635
opus_LIBS
636
opus_CFLAGS
635 637
id3tag_LIBS
636 638
id3tag_CFLAGS
637 639
mad_LIBS
......
784 786
mad_LIBS
785 787
id3tag_CFLAGS
786 788
id3tag_LIBS
789
opus_CFLAGS
790
opus_LIBS
787 791
X11_CFLAGS
788 792
X11_LIBS'
789 793

  
......
1464 1468
  id3tag_CFLAGS
1465 1469
              C compiler flags for id3tag, overriding pkg-config
1466 1470
  id3tag_LIBS linker flags for id3tag, overriding pkg-config
1471
  opus_CFLAGS C compiler flags for opus, overriding pkg-config
1472
  opus_LIBS   linker flags for opus, overriding pkg-config
1467 1473
  X11_CFLAGS  C compiler flags for X11, overriding pkg-config
1468 1474
  X11_LIBS    linker flags for X11, overriding pkg-config
1469 1475

  
......
4411 4417

  
4412 4418

  
4413 4419
SV_DEFINES_DEBUG="-DDEBUG -DBUILD_DEBUG -DWANT_TIMING"
4414
SV_DEFINES_RELEASE="-DNDEBUG -DBUILD_RELEASE -DNO_TIMING"
4415
SV_DEFINES_MINIMAL="$SV_DEFINES_RELEASE"
4420
SV_DEFINES_RELEASE="-DNDEBUG -DBUILD_RELEASE -DNO_TIMING -DNO_HIT_COUNTS"
4416 4421

  
4417 4422
# Now we have: USER_CXXFLAGS contains any flags the user set
4418 4423
# explicitly; AUTOCONF_CXXFLAGS contains flags that Autoconf thought
......
4420 4425
# allow ourselves to be overridden (later) by the former
4421 4426

  
4422 4427
CXXFLAGS_DEBUG="$AUTOCONF_CXXFLAGS"
4428
OPTFLAGS_DEBUG="-O2"
4429
LDFLAGS_DEBUG=""
4423 4430
CXXFLAGS_RELEASE="$AUTOCONF_CXXFLAGS"
4424
CXXFLAGS_MINIMAL="$AUTOCONF_CXXFLAGS"
4431
OPTFLAGS_RELEASE="-O2"
4432
LDFLAGS_RELEASE=""
4433
CXXSTANDARD=c++14
4425 4434

  
4426 4435
if test "x$GCC" = "xyes"; then
4427
   	CXXFLAGS_ANY="-std=c++11 -fpic -Wall -Wextra -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -Wconversion -pipe"
4436
   	CXXFLAGS_ANY="-fpic -Wall -Wextra -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -Wconversion -pipe"
4428 4437
        CXXFLAGS_DEBUG="$CXXFLAGS_ANY -g -Werror"
4429
   	CXXFLAGS_RELEASE="$CXXFLAGS_ANY -g0 -O3 -ffast-math"
4430
   	CXXFLAGS_MINIMAL="$CXXFLAGS_ANY -g0 -O0"
4431
fi
4432

  
4433
CXXFLAGS_BUILD="$CXXFLAGS_RELEASE"
4438
        OPTFLAGS_DEBUG="-O2"
4439
   	CXXFLAGS_RELEASE="$CXXFLAGS_ANY -g0"
4440
        OPTFLAGS_RELEASE="-O3 -ffast-math"
4441
        LIBS_DEBUG="$LIBS"
4442
        as_CACHEVAR=`$as_echo "ax_cv_check_cxxflags__--std=$CXXSTANDARD" | $as_tr_sh`
4443
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts --std=$CXXSTANDARD" >&5
4444
$as_echo_n "checking whether C++ compiler accepts --std=$CXXSTANDARD... " >&6; }
4445
if eval \${$as_CACHEVAR+:} false; then :
4446
  $as_echo_n "(cached) " >&6
4447
else
4448

  
4449
  ax_check_save_flags=$CXXFLAGS
4450
  CXXFLAGS="$CXXFLAGS  --std=$CXXSTANDARD"
4451
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4452
/* end confdefs.h.  */
4453

  
4454
int
4455
main ()
4456
{
4457

  
4458
  ;
4459
  return 0;
4460
}
4461
_ACEOF
4462
if ac_fn_cxx_try_compile "$LINENO"; then :
4463
  eval "$as_CACHEVAR=yes"
4464
else
4465
  eval "$as_CACHEVAR=no"
4466
fi
4467
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
4468
  CXXFLAGS=$ax_check_save_flags
4469
fi
4470
eval ac_res=\$$as_CACHEVAR
4471
	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
4472
$as_echo "$ac_res" >&6; }
4473
if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
4474
  :
4475
else
4476
  { $as_echo "$as_me:${as_lineno-$LINENO}: Compiler does not appear to support $CXXSTANDARD, falling back to c++11" >&5
4477
$as_echo "$as_me: Compiler does not appear to support $CXXSTANDARD, falling back to c++11" >&6;}
4478
        CXXSTANDARD=c++11
4479
fi
4480

  
4481
fi
4482

  
4483
CXXFLAGS_BUILD="$CXXFLAGS_RELEASE $OPTFLAGS_RELEASE"
4484
LDFLAGS_BUILD="$LDFLAGS_RELEASE $OPTFLAGS_RELEASE"
4434 4485
SV_DEFINES_BUILD="$SV_DEFINES_RELEASE"
4435 4486

  
4436 4487
QMAKE_CONFIG="release"
......
4440 4491
  enableval=$enable_debug; { $as_echo "$as_me:${as_lineno-$LINENO}: enabling debug build" >&5
4441 4492
$as_echo "$as_me: enabling debug build" >&6;}
4442 4493
QMAKE_CONFIG="debug"
4443
CXXFLAGS_BUILD="$CXXFLAGS_DEBUG"
4494
CXXFLAGS_BUILD="$CXXFLAGS_DEBUG $OPTFLAGS_DEBUG"
4495
LDFLAGS_BUILD="$LDFLAGS_DEBUG"
4444 4496
SV_DEFINES_BUILD="$SV_DEFINES_DEBUG"
4497
LIBS="$LIBS_DEBUG"
4445 4498
fi
4446 4499

  
4447 4500

  
......
4451 4504
	{ $as_echo "$as_me:${as_lineno-$LINENO}: Overriding default compiler flags with the above user setting." >&5
4452 4505
$as_echo "$as_me: Overriding default compiler flags with the above user setting." >&6;}
4453 4506
	CXXFLAGS_BUILD="$USER_CXXFLAGS"
4454
	CXXFLAGS_MINIMAL="$USER_CXXFLAGS"
4507
        LDFLAGS_BUILD=""
4455 4508
fi
4456 4509

  
4457 4510
CXXFLAGS="$CXXFLAGS_BUILD $SV_DEFINES_BUILD"
4511
LDFLAGS="$LDFLAGS_BUILD"
4458 4512

  
4459 4513
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
4460 4514
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
......
7174 7228
fi
7175 7229

  
7176 7230

  
7231
SV_MODULE_MODULE=opus
7232
SV_MODULE_VERSION_TEST="opusfile"
7233
SV_MODULE_HEADER=opus/opusfile.h
7234
SV_MODULE_LIB=opusfile
7235
SV_MODULE_FUNC=op_read_float
7236
SV_MODULE_HAVE=HAVE_$(echo opus | tr 'a-z' 'A-Z')
7237
SV_MODULE_FAILED=1
7238
if test -n "$opus_LIBS" ; then
7239
   { $as_echo "$as_me:${as_lineno-$LINENO}: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&5
7240
$as_echo "$as_me: User set ${SV_MODULE_MODULE}_LIBS explicitly, skipping test for $SV_MODULE_MODULE" >&6;}
7241
   CXXFLAGS="$CXXFLAGS $opus_CFLAGS"
7242
   LIBS="$LIBS $opus_LIBS"
7243
   SV_MODULE_FAILED=""
7244
fi
7245
if test -z "$SV_MODULE_VERSION_TEST" ; then
7246
   SV_MODULE_VERSION_TEST=$SV_MODULE_MODULE
7247
fi
7248
if test -n "$SV_MODULE_FAILED" && test -n "$PKG_CONFIG"; then
7249

  
7250
pkg_failed=no
7251
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for opus" >&5
7252
$as_echo_n "checking for opus... " >&6; }
7253

  
7254
if test -n "$opus_CFLAGS"; then
7255
    pkg_cv_opus_CFLAGS="$opus_CFLAGS"
7256
 elif test -n "$PKG_CONFIG"; then
7257
    if test -n "$PKG_CONFIG" && \
7258
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5
7259
  ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5
7260
  ac_status=$?
7261
  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
7262
  test $ac_status = 0; }; then
7263
  pkg_cv_opus_CFLAGS=`$PKG_CONFIG --cflags "$SV_MODULE_VERSION_TEST" 2>/dev/null`
7264
		      test "x$?" != "x0" && pkg_failed=yes
7265
else
7266
  pkg_failed=yes
7267
fi
7268
 else
7269
    pkg_failed=untried
7270
fi
7271
if test -n "$opus_LIBS"; then
7272
    pkg_cv_opus_LIBS="$opus_LIBS"
7273
 elif test -n "$PKG_CONFIG"; then
7274
    if test -n "$PKG_CONFIG" && \
7275
    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$SV_MODULE_VERSION_TEST\""; } >&5
7276
  ($PKG_CONFIG --exists --print-errors "$SV_MODULE_VERSION_TEST") 2>&5
7277
  ac_status=$?
7278
  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
7279
  test $ac_status = 0; }; then
7280
  pkg_cv_opus_LIBS=`$PKG_CONFIG --libs "$SV_MODULE_VERSION_TEST" 2>/dev/null`
7281
		      test "x$?" != "x0" && pkg_failed=yes
7282
else
7283
  pkg_failed=yes
7284
fi
7285
 else
7286
    pkg_failed=untried
7287
fi
7288

  
7289

  
7290

  
7291
if test $pkg_failed = yes; then
7292
   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7293
$as_echo "no" >&6; }
7294

  
7295
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
7296
        _pkg_short_errors_supported=yes
7297
else
7298
        _pkg_short_errors_supported=no
7299
fi
7300
        if test $_pkg_short_errors_supported = yes; then
7301
	        opus_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
7302
        else
7303
	        opus_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$SV_MODULE_VERSION_TEST" 2>&1`
7304
        fi
7305
	# Put the nasty error message in config.log where it belongs
7306
	echo "$opus_PKG_ERRORS" >&5
7307

  
7308
	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
7309
$as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
7310
elif test $pkg_failed = untried; then
7311
     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
7312
$as_echo "no" >&6; }
7313
	{ $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&5
7314
$as_echo "$as_me: Failed to find optional module $SV_MODULE_MODULE using pkg-config, trying again by old-fashioned means" >&6;}
7315
else
7316
	opus_CFLAGS=$pkg_cv_opus_CFLAGS
7317
	opus_LIBS=$pkg_cv_opus_LIBS
7318
        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
7319
$as_echo "yes" >&6; }
7320
	HAVES="$HAVES $SV_MODULE_HAVE";CXXFLAGS="$CXXFLAGS $opus_CFLAGS";LIBS="$LIBS $opus_LIBS";SV_MODULE_FAILED=""
7321
fi
7322
fi
7323
if test -n "$SV_MODULE_FAILED"; then
7324
   as_ac_Header=`$as_echo "ac_cv_header_$SV_MODULE_HEADER" | $as_tr_sh`
7325
ac_fn_cxx_check_header_mongrel "$LINENO" "$SV_MODULE_HEADER" "$as_ac_Header" "$ac_includes_default"
7326
if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
7327
  HAVES="$HAVES $SV_MODULE_HAVE";SV_MODULE_FAILED=""
7328
else
7329
  { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find header $SV_MODULE_HEADER for optional module $SV_MODULE_MODULE" >&5
7330
$as_echo "$as_me: Failed to find header $SV_MODULE_HEADER for optional module $SV_MODULE_MODULE" >&6;}
7331
fi
7332

  
7333

  
7334
   if test -z "$SV_MODULE_FAILED"; then
7335
      if test -n "$SV_MODULE_LIB"; then
7336
           as_ac_Lib=`$as_echo "ac_cv_lib_$SV_MODULE_LIB''_$SV_MODULE_FUNC" | $as_tr_sh`
7337
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB" >&5
7338
$as_echo_n "checking for $SV_MODULE_FUNC in -l$SV_MODULE_LIB... " >&6; }
7339
if eval \${$as_ac_Lib+:} false; then :
7340
  $as_echo_n "(cached) " >&6
7341
else
7342
  ac_check_lib_save_LIBS=$LIBS
7343
LIBS="-l$SV_MODULE_LIB  $LIBS"
7344
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
7345
/* end confdefs.h.  */
7346

  
7347
/* Override any GCC internal prototype to avoid an error.
7348
   Use char because int might match the return type of a GCC
7349
   builtin and then its argument prototype would still apply.  */
7350
#ifdef __cplusplus
7351
extern "C"
7352
#endif
7353
char $SV_MODULE_FUNC ();
7354
int
7355
main ()
7356
{
7357
return $SV_MODULE_FUNC ();
7358
  ;
7359
  return 0;
7360
}
7361
_ACEOF
7362
if ac_fn_cxx_try_link "$LINENO"; then :
7363
  eval "$as_ac_Lib=yes"
7364
else
7365
  eval "$as_ac_Lib=no"
7366
fi
7367
rm -f core conftest.err conftest.$ac_objext \
7368
    conftest$ac_exeext conftest.$ac_ext
7369
LIBS=$ac_check_lib_save_LIBS
7370
fi
7371
eval ac_res=\$$as_ac_Lib
7372
	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
7373
$as_echo "$ac_res" >&6; }
7374
if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
7375
  LIBS="$LIBS -l$SV_MODULE_LIB"
7376
else
7377
  { $as_echo "$as_me:${as_lineno-$LINENO}: Failed to find library $SV_MODULE_LIB for optional module $SV_MODULE_MODULE" >&5
7378
$as_echo "$as_me: Failed to find library $SV_MODULE_LIB for optional module $SV_MODULE_MODULE" >&6;}
7379
fi
7380

  
7381
      fi
7382
   fi
7383
fi
7384

  
7385

  
7177 7386
# Link in -lX11 if it exists -- this is for the X error handler
7178 7387

  
7179 7388
SV_MODULE_MODULE=X11

Also available in: Unified diff