diff options
Diffstat (limited to 'xset/configure')
| -rwxr-xr-x | xset/configure | 123 |
1 files changed, 74 insertions, 49 deletions
diff --git a/xset/configure b/xset/configure index a3347e7..2f9585d 100755 --- a/xset/configure +++ b/xset/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for xset 1.2.1. +# Generated by GNU Autoconf 2.68 for xset 1.2.2. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -561,8 +561,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='xset' PACKAGE_TARNAME='xset' -PACKAGE_VERSION='1.2.1' -PACKAGE_STRING='xset 1.2.1' +PACKAGE_VERSION='1.2.2' +PACKAGE_STRING='xset 1.2.2' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' PACKAGE_URL='' @@ -647,6 +647,7 @@ build INSTALL_CMD PKG_CONFIG CHANGELOG_CMD +STRICT_CFLAGS CWARNFLAGS EGREP GREP @@ -1305,7 +1306,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xset 1.2.1 to adapt to many kinds of systems. +\`configure' configures xset 1.2.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1375,7 +1376,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xset 1.2.1:";; + short | recursive ) echo "Configuration of xset 1.2.2:";; esac cat <<\_ACEOF @@ -1498,7 +1499,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xset configure 1.2.1 +xset configure 1.2.2 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1822,7 +1823,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xset $as_me 1.2.1, which was +It was created by xset $as_me 1.2.2, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2642,7 +2643,7 @@ fi # Define the identity of the package. PACKAGE='xset' - VERSION='1.2.1' + VERSION='1.2.2' cat >>confdefs.h <<_ACEOF @@ -4274,6 +4275,30 @@ done +ac_fn_c_check_decl "$LINENO" "__clang__" "ac_cv_have_decl___clang__" "$ac_includes_default" +if test "x$ac_cv_have_decl___clang__" = xyes; then : + CLANGCC="yes" +else + CLANGCC="no" +fi + +ac_fn_c_check_decl "$LINENO" "__INTEL_COMPILER" "ac_cv_have_decl___INTEL_COMPILER" "$ac_includes_default" +if test "x$ac_cv_have_decl___INTEL_COMPILER" = xyes; then : + INTELCC="yes" +else + INTELCC="no" +fi + +ac_fn_c_check_decl "$LINENO" "__SUNPRO_C" "ac_cv_have_decl___SUNPRO_C" "$ac_includes_default" +if test "x$ac_cv_have_decl___SUNPRO_C" = xyes; then : + SUNCC="yes" +else + SUNCC="no" +fi + + + + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -4532,6 +4557,7 @@ $as_echo "$ac_cv_path_SED" >&6; } + if test "x$GCC" = xyes ; then CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \ -Wmissing-declarations -Wnested-externs -fno-strict-aliasing \ @@ -4542,13 +4568,6 @@ if test "x$GCC" = xyes ; then ;; esac else - ac_fn_c_check_decl "$LINENO" "__SUNPRO_C" "ac_cv_have_decl___SUNPRO_C" "$ac_includes_default" -if test "x$ac_cv_have_decl___SUNPRO_C" = xyes; then : - SUNCC="yes" -else - SUNCC="no" -fi - if test "x$SUNCC" = "xyes"; then CWARNFLAGS="-v" fi @@ -4560,6 +4579,7 @@ fi + # Check whether --enable-strict-compilation was given. if test "${enable_strict_compilation+set}" = set; then : enableval=$enable_strict_compilation; STRICT_COMPILE=$enableval @@ -4567,30 +4587,36 @@ else STRICT_COMPILE=no fi -if test "x$STRICT_COMPILE" = "xyes"; then - ac_fn_c_check_decl "$LINENO" "__SUNPRO_C" "ac_cv_have_decl___SUNPRO_C" "$ac_includes_default" -if test "x$ac_cv_have_decl___SUNPRO_C" = xyes; then : - SUNCC="yes" +if test "x$GCC" = xyes ; then + STRICT_CFLAGS="-pedantic -Werror" + # Add -Werror=attributes if supported (gcc 4.2 & later) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Werror=attributes" >&5 +$as_echo_n "checking if $CC supports -Werror=attributes... " >&6; } + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $STRICT_CFLAGS -Werror=attributes" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +return 0; +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + STRICT_CFLAGS="$STRICT_CFLAGS -Werror=attributes" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } else - SUNCC="no" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } fi - - ac_fn_c_check_decl "$LINENO" "__INTEL_COMPILER" "ac_cv_have_decl___INTEL_COMPILER" "$ac_includes_default" -if test "x$ac_cv_have_decl___INTEL_COMPILER" = xyes; then : - INTELCC="yes" -else - INTELCC="no" +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$save_CFLAGS" +elif test "x$SUNCC" = "xyes"; then + STRICT_CFLAGS="-errwarn" +elif test "x$INTELCC" = "xyes"; then + STRICT_CFLAGS="-Werror" fi - - if test "x$GCC" = xyes ; then - STRICT_CFLAGS="-pedantic -Werror" - elif test "x$SUNCC" = "xyes"; then - STRICT_CFLAGS="-errwarn" - elif test "x$INTELCC" = "xyes"; then - STRICT_CFLAGS="-Werror" - fi +if test "x$STRICT_COMPILE" = "xyes"; then + CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS" fi -CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS" + @@ -4761,12 +4787,12 @@ if test -n "$XSET_CFLAGS"; then pkg_cv_XSET_CFLAGS="$XSET_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xmuu\""; } >&5 - ($PKG_CONFIG --exists --print-errors "xmuu") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xproto >= 7.0.17 xmuu\""; } >&5 + ($PKG_CONFIG --exists --print-errors "xproto >= 7.0.17 xmuu") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_XSET_CFLAGS=`$PKG_CONFIG --cflags "xmuu" 2>/dev/null` + pkg_cv_XSET_CFLAGS=`$PKG_CONFIG --cflags "xproto >= 7.0.17 xmuu" 2>/dev/null` else pkg_failed=yes fi @@ -4777,12 +4803,12 @@ if test -n "$XSET_LIBS"; then pkg_cv_XSET_LIBS="$XSET_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xmuu\""; } >&5 - ($PKG_CONFIG --exists --print-errors "xmuu") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xproto >= 7.0.17 xmuu\""; } >&5 + ($PKG_CONFIG --exists --print-errors "xproto >= 7.0.17 xmuu") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_XSET_LIBS=`$PKG_CONFIG --libs "xmuu" 2>/dev/null` + pkg_cv_XSET_LIBS=`$PKG_CONFIG --libs "xproto >= 7.0.17 xmuu" 2>/dev/null` else pkg_failed=yes fi @@ -4800,14 +4826,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - XSET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xmuu" 2>&1` + XSET_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "xproto >= 7.0.17 xmuu" 2>&1` else - XSET_PKG_ERRORS=`$PKG_CONFIG --print-errors "xmuu" 2>&1` + XSET_PKG_ERRORS=`$PKG_CONFIG --print-errors "xproto >= 7.0.17 xmuu" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$XSET_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (xmuu) were not met: + as_fn_error $? "Package requirements (xproto >= 7.0.17 xmuu) were not met: $XSET_PKG_ERRORS @@ -5291,9 +5317,7 @@ XSET_CFLAGS="$XSET_CFLAGS $SET_XEXT_CFLAGS $SET_XKB_CFLAGS $SET_XF86MISC_CFLAGS XSET_LIBS="$XSET_LIBS $SET_XEXT_LIBS $SET_XKB_LIBS $SET_XF86MISC_LIBS $SET_FONTCACHE_LIBS" - - -ac_config_files="$ac_config_files Makefile" +ac_config_files="$ac_config_files Makefile man/Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -5833,7 +5857,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xset $as_me 1.2.1, which was +This file was extended by xset $as_me 1.2.2, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5899,7 +5923,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -xset config.status 1.2.1 +xset config.status 1.2.2 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" @@ -6031,6 +6055,7 @@ do "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac |