comparison configure @ 362:9d547101e7cd

Add missing macro, regenerate
author Chris Cannam
date Tue, 28 Jan 2020 14:08:17 +0000
parents 700e9ad49711
children
comparison
equal deleted inserted replaced
361:7e6e3a27d63e 362:9d547101e7cd
697 htmldir 697 htmldir
698 infodir 698 infodir
699 docdir 699 docdir
700 oldincludedir 700 oldincludedir
701 includedir 701 includedir
702 runstatedir
702 localstatedir 703 localstatedir
703 sharedstatedir 704 sharedstatedir
704 sysconfdir 705 sysconfdir
705 datadir 706 datadir
706 datarootdir 707 datarootdir
802 datarootdir='${prefix}/share' 803 datarootdir='${prefix}/share'
803 datadir='${datarootdir}' 804 datadir='${datarootdir}'
804 sysconfdir='${prefix}/etc' 805 sysconfdir='${prefix}/etc'
805 sharedstatedir='${prefix}/com' 806 sharedstatedir='${prefix}/com'
806 localstatedir='${prefix}/var' 807 localstatedir='${prefix}/var'
808 runstatedir='${localstatedir}/run'
807 includedir='${prefix}/include' 809 includedir='${prefix}/include'
808 oldincludedir='/usr/include' 810 oldincludedir='/usr/include'
809 docdir='${datarootdir}/doc/${PACKAGE}' 811 docdir='${datarootdir}/doc/${PACKAGE}'
810 infodir='${datarootdir}/info' 812 infodir='${datarootdir}/info'
811 htmldir='${docdir}' 813 htmldir='${docdir}'
1054 1056
1055 -q | -quiet | --quiet | --quie | --qui | --qu | --q \ 1057 -q | -quiet | --quiet | --quie | --qui | --qu | --q \
1056 | -silent | --silent | --silen | --sile | --sil) 1058 | -silent | --silent | --silen | --sile | --sil)
1057 silent=yes ;; 1059 silent=yes ;;
1058 1060
1061 -runstatedir | --runstatedir | --runstatedi | --runstated \
1062 | --runstate | --runstat | --runsta | --runst | --runs \
1063 | --run | --ru | --r)
1064 ac_prev=runstatedir ;;
1065 -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
1066 | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
1067 | --run=* | --ru=* | --r=*)
1068 runstatedir=$ac_optarg ;;
1069
1059 -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) 1070 -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
1060 ac_prev=sbindir ;; 1071 ac_prev=sbindir ;;
1061 -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ 1072 -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
1062 | --sbi=* | --sb=*) 1073 | --sbi=* | --sb=*)
1063 sbindir=$ac_optarg ;; 1074 sbindir=$ac_optarg ;;
1191 1202
1192 # Check all directory arguments for consistency. 1203 # Check all directory arguments for consistency.
1193 for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ 1204 for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
1194 datadir sysconfdir sharedstatedir localstatedir includedir \ 1205 datadir sysconfdir sharedstatedir localstatedir includedir \
1195 oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ 1206 oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
1196 libdir localedir mandir 1207 libdir localedir mandir runstatedir
1197 do 1208 do
1198 eval ac_val=\$$ac_var 1209 eval ac_val=\$$ac_var
1199 # Remove trailing slashes. 1210 # Remove trailing slashes.
1200 case $ac_val in 1211 case $ac_val in
1201 */ ) 1212 */ )
1344 --sbindir=DIR system admin executables [EPREFIX/sbin] 1355 --sbindir=DIR system admin executables [EPREFIX/sbin]
1345 --libexecdir=DIR program executables [EPREFIX/libexec] 1356 --libexecdir=DIR program executables [EPREFIX/libexec]
1346 --sysconfdir=DIR read-only single-machine data [PREFIX/etc] 1357 --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
1347 --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] 1358 --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
1348 --localstatedir=DIR modifiable single-machine data [PREFIX/var] 1359 --localstatedir=DIR modifiable single-machine data [PREFIX/var]
1360 --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
1349 --libdir=DIR object code libraries [EPREFIX/lib] 1361 --libdir=DIR object code libraries [EPREFIX/lib]
1350 --includedir=DIR C header files [PREFIX/include] 1362 --includedir=DIR C header files [PREFIX/include]
1351 --oldincludedir=DIR C header files for non-gcc [/usr/include] 1363 --oldincludedir=DIR C header files for non-gcc [/usr/include]
1352 --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] 1364 --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
1353 --datadir=DIR read-only architecture-independent data [DATAROOTDIR] 1365 --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
4385 OPTFLAGS_DEBUG="-O2" 4397 OPTFLAGS_DEBUG="-O2"
4386 LDFLAGS_DEBUG="" 4398 LDFLAGS_DEBUG=""
4387 CXXFLAGS_RELEASE="$AUTOCONF_CXXFLAGS" 4399 CXXFLAGS_RELEASE="$AUTOCONF_CXXFLAGS"
4388 OPTFLAGS_RELEASE="-O2" 4400 OPTFLAGS_RELEASE="-O2"
4389 LDFLAGS_RELEASE="" 4401 LDFLAGS_RELEASE=""
4390 CXXSTANDARD=c++14 4402 CXXSTANDARD="c++14"
4391 4403
4392 if test "x$GCC" = "xyes"; then 4404 if test "x$GCC" = "xyes"; then
4393 CXXFLAGS_ANY="-fpic -Wall -Wextra -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -Wconversion -pipe" 4405 CXXFLAGS_ANY="-fpic -Wall -Wextra -Woverloaded-virtual -Wformat-nonliteral -Wformat-security -Winit-self -Wswitch-enum -Wconversion -pipe"
4394 CXXFLAGS_DEBUG="$CXXFLAGS_ANY -g -Werror" 4406 CXXFLAGS_DEBUG="$CXXFLAGS_ANY -g -Werror"
4395 OPTFLAGS_DEBUG="-O2" 4407 OPTFLAGS_DEBUG="-O2"
4396 CXXFLAGS_RELEASE="$CXXFLAGS_ANY -g0" 4408 CXXFLAGS_RELEASE="$CXXFLAGS_ANY -g0"
4397 OPTFLAGS_RELEASE="-O3 -ffast-math" 4409 OPTFLAGS_RELEASE="-O3"
4398 LIBS_DEBUG="$LIBS" 4410 LIBS_DEBUG="$LIBS"
4399 as_CACHEVAR=`$as_echo "ax_cv_check_cxxflags__--std=$CXXSTANDARD" | $as_tr_sh` 4411 as_CACHEVAR=`$as_echo "ax_cv_check_cxxflags__--std=$CXXSTANDARD" | $as_tr_sh`
4400 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts --std=$CXXSTANDARD" >&5 4412 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C++ compiler accepts --std=$CXXSTANDARD" >&5
4401 $as_echo_n "checking whether C++ compiler accepts --std=$CXXSTANDARD... " >&6; } 4413 $as_echo_n "checking whether C++ compiler accepts --std=$CXXSTANDARD... " >&6; }
4402 if eval \${$as_CACHEVAR+:} false; then : 4414 if eval \${$as_CACHEVAR+:} false; then :
4430 if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then : 4442 if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
4431 : 4443 :
4432 else 4444 else
4433 { $as_echo "$as_me:${as_lineno-$LINENO}: Compiler does not appear to support $CXXSTANDARD, falling back to c++11" >&5 4445 { $as_echo "$as_me:${as_lineno-$LINENO}: Compiler does not appear to support $CXXSTANDARD, falling back to c++11" >&5
4434 $as_echo "$as_me: Compiler does not appear to support $CXXSTANDARD, falling back to c++11" >&6;} 4446 $as_echo "$as_me: Compiler does not appear to support $CXXSTANDARD, falling back to c++11" >&6;}
4435 CXXSTANDARD=c++11 4447 CXXSTANDARD="c++11"
4436 fi 4448 fi
4437 4449
4438 fi 4450 fi
4439 4451
4440 CXXFLAGS_BUILD="$CXXFLAGS_RELEASE $OPTFLAGS_RELEASE" 4452 CXXFLAGS_BUILD="$CXXFLAGS_RELEASE $OPTFLAGS_RELEASE"