diff options
-rwxr-xr-x | configure | 405 |
1 files changed, 374 insertions, 31 deletions
@@ -647,6 +647,11 @@ HAVE_OVERLAYFS | |||
647 | EXTRA_LDFLAGS | 647 | EXTRA_LDFLAGS |
648 | EXTRA_CFLAGS | 648 | EXTRA_CFLAGS |
649 | HAVE_APPARMOR | 649 | HAVE_APPARMOR |
650 | AA_LIBS | ||
651 | AA_CFLAGS | ||
652 | PKG_CONFIG_LIBDIR | ||
653 | PKG_CONFIG_PATH | ||
654 | PKG_CONFIG | ||
650 | RANLIB | 655 | RANLIB |
651 | INSTALL_DATA | 656 | INSTALL_DATA |
652 | INSTALL_SCRIPT | 657 | INSTALL_SCRIPT |
@@ -677,7 +682,6 @@ infodir | |||
677 | docdir | 682 | docdir |
678 | oldincludedir | 683 | oldincludedir |
679 | includedir | 684 | includedir |
680 | runstatedir | ||
681 | localstatedir | 685 | localstatedir |
682 | sharedstatedir | 686 | sharedstatedir |
683 | sysconfdir | 687 | sysconfdir |
@@ -726,6 +730,11 @@ CFLAGS | |||
726 | LDFLAGS | 730 | LDFLAGS |
727 | LIBS | 731 | LIBS |
728 | CPPFLAGS | 732 | CPPFLAGS |
733 | PKG_CONFIG | ||
734 | PKG_CONFIG_PATH | ||
735 | PKG_CONFIG_LIBDIR | ||
736 | AA_CFLAGS | ||
737 | AA_LIBS | ||
729 | CPP' | 738 | CPP' |
730 | 739 | ||
731 | 740 | ||
@@ -765,7 +774,6 @@ datadir='${datarootdir}' | |||
765 | sysconfdir='${prefix}/etc' | 774 | sysconfdir='${prefix}/etc' |
766 | sharedstatedir='${prefix}/com' | 775 | sharedstatedir='${prefix}/com' |
767 | localstatedir='${prefix}/var' | 776 | localstatedir='${prefix}/var' |
768 | runstatedir='${localstatedir}/run' | ||
769 | includedir='${prefix}/include' | 777 | includedir='${prefix}/include' |
770 | oldincludedir='/usr/include' | 778 | oldincludedir='/usr/include' |
771 | docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' | 779 | docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' |
@@ -1018,15 +1026,6 @@ do | |||
1018 | | -silent | --silent | --silen | --sile | --sil) | 1026 | | -silent | --silent | --silen | --sile | --sil) |
1019 | silent=yes ;; | 1027 | silent=yes ;; |
1020 | 1028 | ||
1021 | -runstatedir | --runstatedir | --runstatedi | --runstated \ | ||
1022 | | --runstate | --runstat | --runsta | --runst | --runs \ | ||
1023 | | --run | --ru | --r) | ||
1024 | ac_prev=runstatedir ;; | ||
1025 | -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ | ||
1026 | | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ | ||
1027 | | --run=* | --ru=* | --r=*) | ||
1028 | runstatedir=$ac_optarg ;; | ||
1029 | |||
1030 | -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) | 1029 | -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) |
1031 | ac_prev=sbindir ;; | 1030 | ac_prev=sbindir ;; |
1032 | -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ | 1031 | -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ |
@@ -1164,7 +1163,7 @@ fi | |||
1164 | for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ | 1163 | for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ |
1165 | datadir sysconfdir sharedstatedir localstatedir includedir \ | 1164 | datadir sysconfdir sharedstatedir localstatedir includedir \ |
1166 | oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ | 1165 | oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ |
1167 | libdir localedir mandir runstatedir | 1166 | libdir localedir mandir |
1168 | do | 1167 | do |
1169 | eval ac_val=\$$ac_var | 1168 | eval ac_val=\$$ac_var |
1170 | # Remove trailing slashes. | 1169 | # Remove trailing slashes. |
@@ -1317,7 +1316,6 @@ Fine tuning of the installation directories: | |||
1317 | --sysconfdir=DIR read-only single-machine data [PREFIX/etc] | 1316 | --sysconfdir=DIR read-only single-machine data [PREFIX/etc] |
1318 | --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] | 1317 | --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] |
1319 | --localstatedir=DIR modifiable single-machine data [PREFIX/var] | 1318 | --localstatedir=DIR modifiable single-machine data [PREFIX/var] |
1320 | --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] | ||
1321 | --libdir=DIR object code libraries [EPREFIX/lib] | 1319 | --libdir=DIR object code libraries [EPREFIX/lib] |
1322 | --includedir=DIR C header files [PREFIX/include] | 1320 | --includedir=DIR C header files [PREFIX/include] |
1323 | --oldincludedir=DIR C header files for non-gcc [/usr/include] | 1321 | --oldincludedir=DIR C header files for non-gcc [/usr/include] |
@@ -1376,6 +1374,13 @@ Some influential environment variables: | |||
1376 | LIBS libraries to pass to the linker, e.g. -l<library> | 1374 | LIBS libraries to pass to the linker, e.g. -l<library> |
1377 | CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if | 1375 | CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if |
1378 | you have headers in a nonstandard directory <include dir> | 1376 | you have headers in a nonstandard directory <include dir> |
1377 | PKG_CONFIG path to pkg-config utility | ||
1378 | PKG_CONFIG_PATH | ||
1379 | directories to add to pkg-config's search path | ||
1380 | PKG_CONFIG_LIBDIR | ||
1381 | path overriding pkg-config's built-in search path | ||
1382 | AA_CFLAGS C compiler flags for AA, overriding pkg-config | ||
1383 | AA_LIBS linker flags for AA, overriding pkg-config | ||
1379 | CPP C preprocessor | 1384 | CPP C preprocessor |
1380 | 1385 | ||
1381 | Use these variables to override the choices made by `configure' or to help | 1386 | Use these variables to override the choices made by `configure' or to help |
@@ -3104,22 +3109,151 @@ fi | |||
3104 | 3109 | ||
3105 | 3110 | ||
3106 | HAVE_SPECTRE="no" | 3111 | HAVE_SPECTRE="no" |
3107 | AX_CHECK_COMPILE_FLAG( | 3112 | |
3108 | -mindirect-branch=thunk, | 3113 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -mindirect-branch=thunk" >&5 |
3109 | HAVE_SPECTRE="yes" && EXTRA_CFLAGS+=" -mindirect-branch=thunk" | 3114 | $as_echo_n "checking whether C compiler accepts -mindirect-branch=thunk... " >&6; } |
3110 | ) | 3115 | if ${ax_cv_check_cflags___mindirect_branch_thunk+:} false; then : |
3111 | AX_CHECK_COMPILE_FLAG( | 3116 | $as_echo_n "(cached) " >&6 |
3112 | -mretpoline, | 3117 | else |
3113 | HAVE_SPECTRE="yes" && EXTRA_CFLAGS+=" -mretpoline" | 3118 | |
3114 | ) | 3119 | ax_check_save_flags=$CFLAGS |
3115 | AX_CHECK_COMPILE_FLAG( | 3120 | CFLAGS="$CFLAGS -mindirect-branch=thunk" |
3116 | -fstack-clash-protection, | 3121 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
3117 | HAVE_SPECTRE="yes" && EXTRA_CFLAGS+=" -fstack-clash-protection" | 3122 | /* end confdefs.h. */ |
3118 | ) | 3123 | |
3119 | AX_CHECK_COMPILE_FLAG( | 3124 | int |
3120 | -fstack-protector-strong, | 3125 | main () |
3121 | HAVE_SPECTRE="yes" && EXTRA_CFLAGS+=" -fstack-protector-strong" | 3126 | { |
3122 | ) | 3127 | |
3128 | ; | ||
3129 | return 0; | ||
3130 | } | ||
3131 | _ACEOF | ||
3132 | if ac_fn_c_try_compile "$LINENO"; then : | ||
3133 | ax_cv_check_cflags___mindirect_branch_thunk=yes | ||
3134 | else | ||
3135 | ax_cv_check_cflags___mindirect_branch_thunk=no | ||
3136 | fi | ||
3137 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3138 | CFLAGS=$ax_check_save_flags | ||
3139 | fi | ||
3140 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___mindirect_branch_thunk" >&5 | ||
3141 | $as_echo "$ax_cv_check_cflags___mindirect_branch_thunk" >&6; } | ||
3142 | if test "x$ax_cv_check_cflags___mindirect_branch_thunk" = xyes; then : | ||
3143 | HAVE_SPECTRE="yes" && EXTRA_CFLAGS+=" -mindirect-branch=thunk" | ||
3144 | |||
3145 | else | ||
3146 | : | ||
3147 | fi | ||
3148 | |||
3149 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -mretpoline" >&5 | ||
3150 | $as_echo_n "checking whether C compiler accepts -mretpoline... " >&6; } | ||
3151 | if ${ax_cv_check_cflags___mretpoline+:} false; then : | ||
3152 | $as_echo_n "(cached) " >&6 | ||
3153 | else | ||
3154 | |||
3155 | ax_check_save_flags=$CFLAGS | ||
3156 | CFLAGS="$CFLAGS -mretpoline" | ||
3157 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
3158 | /* end confdefs.h. */ | ||
3159 | |||
3160 | int | ||
3161 | main () | ||
3162 | { | ||
3163 | |||
3164 | ; | ||
3165 | return 0; | ||
3166 | } | ||
3167 | _ACEOF | ||
3168 | if ac_fn_c_try_compile "$LINENO"; then : | ||
3169 | ax_cv_check_cflags___mretpoline=yes | ||
3170 | else | ||
3171 | ax_cv_check_cflags___mretpoline=no | ||
3172 | fi | ||
3173 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3174 | CFLAGS=$ax_check_save_flags | ||
3175 | fi | ||
3176 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___mretpoline" >&5 | ||
3177 | $as_echo "$ax_cv_check_cflags___mretpoline" >&6; } | ||
3178 | if test "x$ax_cv_check_cflags___mretpoline" = xyes; then : | ||
3179 | HAVE_SPECTRE="yes" && EXTRA_CFLAGS+=" -mretpoline" | ||
3180 | |||
3181 | else | ||
3182 | : | ||
3183 | fi | ||
3184 | |||
3185 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fstack-clash-protection" >&5 | ||
3186 | $as_echo_n "checking whether C compiler accepts -fstack-clash-protection... " >&6; } | ||
3187 | if ${ax_cv_check_cflags___fstack_clash_protection+:} false; then : | ||
3188 | $as_echo_n "(cached) " >&6 | ||
3189 | else | ||
3190 | |||
3191 | ax_check_save_flags=$CFLAGS | ||
3192 | CFLAGS="$CFLAGS -fstack-clash-protection" | ||
3193 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
3194 | /* end confdefs.h. */ | ||
3195 | |||
3196 | int | ||
3197 | main () | ||
3198 | { | ||
3199 | |||
3200 | ; | ||
3201 | return 0; | ||
3202 | } | ||
3203 | _ACEOF | ||
3204 | if ac_fn_c_try_compile "$LINENO"; then : | ||
3205 | ax_cv_check_cflags___fstack_clash_protection=yes | ||
3206 | else | ||
3207 | ax_cv_check_cflags___fstack_clash_protection=no | ||
3208 | fi | ||
3209 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3210 | CFLAGS=$ax_check_save_flags | ||
3211 | fi | ||
3212 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fstack_clash_protection" >&5 | ||
3213 | $as_echo "$ax_cv_check_cflags___fstack_clash_protection" >&6; } | ||
3214 | if test "x$ax_cv_check_cflags___fstack_clash_protection" = xyes; then : | ||
3215 | HAVE_SPECTRE="yes" && EXTRA_CFLAGS+=" -fstack-clash-protection" | ||
3216 | |||
3217 | else | ||
3218 | : | ||
3219 | fi | ||
3220 | |||
3221 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fstack-protector-strong" >&5 | ||
3222 | $as_echo_n "checking whether C compiler accepts -fstack-protector-strong... " >&6; } | ||
3223 | if ${ax_cv_check_cflags___fstack_protector_strong+:} false; then : | ||
3224 | $as_echo_n "(cached) " >&6 | ||
3225 | else | ||
3226 | |||
3227 | ax_check_save_flags=$CFLAGS | ||
3228 | CFLAGS="$CFLAGS -fstack-protector-strong" | ||
3229 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext | ||
3230 | /* end confdefs.h. */ | ||
3231 | |||
3232 | int | ||
3233 | main () | ||
3234 | { | ||
3235 | |||
3236 | ; | ||
3237 | return 0; | ||
3238 | } | ||
3239 | _ACEOF | ||
3240 | if ac_fn_c_try_compile "$LINENO"; then : | ||
3241 | ax_cv_check_cflags___fstack_protector_strong=yes | ||
3242 | else | ||
3243 | ax_cv_check_cflags___fstack_protector_strong=no | ||
3244 | fi | ||
3245 | rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext | ||
3246 | CFLAGS=$ax_check_save_flags | ||
3247 | fi | ||
3248 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___fstack_protector_strong" >&5 | ||
3249 | $as_echo "$ax_cv_check_cflags___fstack_protector_strong" >&6; } | ||
3250 | if test "x$ax_cv_check_cflags___fstack_protector_strong" = xyes; then : | ||
3251 | HAVE_SPECTRE="yes" && EXTRA_CFLAGS+=" -fstack-protector-strong" | ||
3252 | |||
3253 | else | ||
3254 | : | ||
3255 | fi | ||
3256 | |||
3123 | 3257 | ||
3124 | HAVE_APPARMOR="" | 3258 | HAVE_APPARMOR="" |
3125 | # Check whether --enable-apparmor was given. | 3259 | # Check whether --enable-apparmor was given. |
@@ -3127,10 +3261,220 @@ if test "${enable_apparmor+set}" = set; then : | |||
3127 | enableval=$enable_apparmor; | 3261 | enableval=$enable_apparmor; |
3128 | fi | 3262 | fi |
3129 | 3263 | ||
3264 | |||
3265 | |||
3266 | |||
3267 | |||
3268 | |||
3269 | |||
3270 | |||
3271 | if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then | ||
3272 | if test -n "$ac_tool_prefix"; then | ||
3273 | # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. | ||
3274 | set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 | ||
3275 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
3276 | $as_echo_n "checking for $ac_word... " >&6; } | ||
3277 | if ${ac_cv_path_PKG_CONFIG+:} false; then : | ||
3278 | $as_echo_n "(cached) " >&6 | ||
3279 | else | ||
3280 | case $PKG_CONFIG in | ||
3281 | [\\/]* | ?:[\\/]*) | ||
3282 | ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. | ||
3283 | ;; | ||
3284 | *) | ||
3285 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
3286 | for as_dir in $PATH | ||
3287 | do | ||
3288 | IFS=$as_save_IFS | ||
3289 | test -z "$as_dir" && as_dir=. | ||
3290 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
3291 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
3292 | ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" | ||
3293 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
3294 | break 2 | ||
3295 | fi | ||
3296 | done | ||
3297 | done | ||
3298 | IFS=$as_save_IFS | ||
3299 | |||
3300 | ;; | ||
3301 | esac | ||
3302 | fi | ||
3303 | PKG_CONFIG=$ac_cv_path_PKG_CONFIG | ||
3304 | if test -n "$PKG_CONFIG"; then | ||
3305 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 | ||
3306 | $as_echo "$PKG_CONFIG" >&6; } | ||
3307 | else | ||
3308 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
3309 | $as_echo "no" >&6; } | ||
3310 | fi | ||
3311 | |||
3312 | |||
3313 | fi | ||
3314 | if test -z "$ac_cv_path_PKG_CONFIG"; then | ||
3315 | ac_pt_PKG_CONFIG=$PKG_CONFIG | ||
3316 | # Extract the first word of "pkg-config", so it can be a program name with args. | ||
3317 | set dummy pkg-config; ac_word=$2 | ||
3318 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | ||
3319 | $as_echo_n "checking for $ac_word... " >&6; } | ||
3320 | if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then : | ||
3321 | $as_echo_n "(cached) " >&6 | ||
3322 | else | ||
3323 | case $ac_pt_PKG_CONFIG in | ||
3324 | [\\/]* | ?:[\\/]*) | ||
3325 | ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path. | ||
3326 | ;; | ||
3327 | *) | ||
3328 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | ||
3329 | for as_dir in $PATH | ||
3330 | do | ||
3331 | IFS=$as_save_IFS | ||
3332 | test -z "$as_dir" && as_dir=. | ||
3333 | for ac_exec_ext in '' $ac_executable_extensions; do | ||
3334 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | ||
3335 | ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" | ||
3336 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | ||
3337 | break 2 | ||
3338 | fi | ||
3339 | done | ||
3340 | done | ||
3341 | IFS=$as_save_IFS | ||
3342 | |||
3343 | ;; | ||
3344 | esac | ||
3345 | fi | ||
3346 | ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG | ||
3347 | if test -n "$ac_pt_PKG_CONFIG"; then | ||
3348 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5 | ||
3349 | $as_echo "$ac_pt_PKG_CONFIG" >&6; } | ||
3350 | else | ||
3351 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
3352 | $as_echo "no" >&6; } | ||
3353 | fi | ||
3354 | |||
3355 | if test "x$ac_pt_PKG_CONFIG" = x; then | ||
3356 | PKG_CONFIG="" | ||
3357 | else | ||
3358 | case $cross_compiling:$ac_tool_warned in | ||
3359 | yes:) | ||
3360 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 | ||
3361 | $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} | ||
3362 | ac_tool_warned=yes ;; | ||
3363 | esac | ||
3364 | PKG_CONFIG=$ac_pt_PKG_CONFIG | ||
3365 | fi | ||
3366 | else | ||
3367 | PKG_CONFIG="$ac_cv_path_PKG_CONFIG" | ||
3368 | fi | ||
3369 | |||
3370 | fi | ||
3371 | if test -n "$PKG_CONFIG"; then | ||
3372 | _pkg_min_version=0.9.0 | ||
3373 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5 | ||
3374 | $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; } | ||
3375 | if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then | ||
3376 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
3377 | $as_echo "yes" >&6; } | ||
3378 | else | ||
3379 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
3380 | $as_echo "no" >&6; } | ||
3381 | PKG_CONFIG="" | ||
3382 | fi | ||
3383 | fi | ||
3130 | if test "x$enable_apparmor" = "xyes"; then : | 3384 | if test "x$enable_apparmor" = "xyes"; then : |
3131 | 3385 | ||
3132 | HAVE_APPARMOR="-DHAVE_APPARMOR" | 3386 | HAVE_APPARMOR="-DHAVE_APPARMOR" |
3133 | PKG_CHECK_MODULES(AA, libapparmor, EXTRA_CFLAGS+=" $AA_CFLAGS" && EXTRA_LDFLAGS+=" $AA_LIBS") | 3387 | |
3388 | pkg_failed=no | ||
3389 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AA" >&5 | ||
3390 | $as_echo_n "checking for AA... " >&6; } | ||
3391 | |||
3392 | if test -n "$AA_CFLAGS"; then | ||
3393 | pkg_cv_AA_CFLAGS="$AA_CFLAGS" | ||
3394 | elif test -n "$PKG_CONFIG"; then | ||
3395 | if test -n "$PKG_CONFIG" && \ | ||
3396 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libapparmor\""; } >&5 | ||
3397 | ($PKG_CONFIG --exists --print-errors "libapparmor") 2>&5 | ||
3398 | ac_status=$? | ||
3399 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
3400 | test $ac_status = 0; }; then | ||
3401 | pkg_cv_AA_CFLAGS=`$PKG_CONFIG --cflags "libapparmor" 2>/dev/null` | ||
3402 | test "x$?" != "x0" && pkg_failed=yes | ||
3403 | else | ||
3404 | pkg_failed=yes | ||
3405 | fi | ||
3406 | else | ||
3407 | pkg_failed=untried | ||
3408 | fi | ||
3409 | if test -n "$AA_LIBS"; then | ||
3410 | pkg_cv_AA_LIBS="$AA_LIBS" | ||
3411 | elif test -n "$PKG_CONFIG"; then | ||
3412 | if test -n "$PKG_CONFIG" && \ | ||
3413 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libapparmor\""; } >&5 | ||
3414 | ($PKG_CONFIG --exists --print-errors "libapparmor") 2>&5 | ||
3415 | ac_status=$? | ||
3416 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 | ||
3417 | test $ac_status = 0; }; then | ||
3418 | pkg_cv_AA_LIBS=`$PKG_CONFIG --libs "libapparmor" 2>/dev/null` | ||
3419 | test "x$?" != "x0" && pkg_failed=yes | ||
3420 | else | ||
3421 | pkg_failed=yes | ||
3422 | fi | ||
3423 | else | ||
3424 | pkg_failed=untried | ||
3425 | fi | ||
3426 | |||
3427 | |||
3428 | |||
3429 | if test $pkg_failed = yes; then | ||
3430 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
3431 | $as_echo "no" >&6; } | ||
3432 | |||
3433 | if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then | ||
3434 | _pkg_short_errors_supported=yes | ||
3435 | else | ||
3436 | _pkg_short_errors_supported=no | ||
3437 | fi | ||
3438 | if test $_pkg_short_errors_supported = yes; then | ||
3439 | AA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libapparmor" 2>&1` | ||
3440 | else | ||
3441 | AA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libapparmor" 2>&1` | ||
3442 | fi | ||
3443 | # Put the nasty error message in config.log where it belongs | ||
3444 | echo "$AA_PKG_ERRORS" >&5 | ||
3445 | |||
3446 | as_fn_error $? "Package requirements (libapparmor) were not met: | ||
3447 | |||
3448 | $AA_PKG_ERRORS | ||
3449 | |||
3450 | Consider adjusting the PKG_CONFIG_PATH environment variable if you | ||
3451 | installed software in a non-standard prefix. | ||
3452 | |||
3453 | Alternatively, you may set the environment variables AA_CFLAGS | ||
3454 | and AA_LIBS to avoid the need to call pkg-config. | ||
3455 | See the pkg-config man page for more details." "$LINENO" 5 | ||
3456 | elif test $pkg_failed = untried; then | ||
3457 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | ||
3458 | $as_echo "no" >&6; } | ||
3459 | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 | ||
3460 | $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} | ||
3461 | as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it | ||
3462 | is in your PATH or set the PKG_CONFIG environment variable to the full | ||
3463 | path to pkg-config. | ||
3464 | |||
3465 | Alternatively, you may set the environment variables AA_CFLAGS | ||
3466 | and AA_LIBS to avoid the need to call pkg-config. | ||
3467 | See the pkg-config man page for more details. | ||
3468 | |||
3469 | To get pkg-config, see <http://pkg-config.freedesktop.org/>. | ||
3470 | See \`config.log' for more details" "$LINENO" 5; } | ||
3471 | else | ||
3472 | AA_CFLAGS=$pkg_cv_AA_CFLAGS | ||
3473 | AA_LIBS=$pkg_cv_AA_LIBS | ||
3474 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | ||
3475 | $as_echo "yes" >&6; } | ||
3476 | EXTRA_CFLAGS+=" $AA_CFLAGS" && EXTRA_LDFLAGS+=" $AA_LIBS" | ||
3477 | fi | ||
3134 | 3478 | ||
3135 | 3479 | ||
3136 | fi | 3480 | fi |
@@ -3352,7 +3696,6 @@ fi | |||
3352 | 3696 | ||
3353 | 3697 | ||
3354 | # checking pthread library | 3698 | # checking pthread library |
3355 | |||
3356 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lpthread" >&5 | 3699 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lpthread" >&5 |
3357 | $as_echo_n "checking for main in -lpthread... " >&6; } | 3700 | $as_echo_n "checking for main in -lpthread... " >&6; } |
3358 | if ${ac_cv_lib_pthread_main+:} false; then : | 3701 | if ${ac_cv_lib_pthread_main+:} false; then : |