diff options
Diffstat (limited to 'app/xinit/configure')
| -rw-r--r-- | app/xinit/configure | 116 |
1 files changed, 84 insertions, 32 deletions
diff --git a/app/xinit/configure b/app/xinit/configure index 8fc43f12c..1215575d0 100644 --- a/app/xinit/configure +++ b/app/xinit/configure @@ -627,9 +627,9 @@ ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS LIBOBJS -XINITDIR XCONSOLE WM +XINITDIR XINIT XAUTH XSERVER @@ -659,6 +659,7 @@ bundleidprefix launchdaemonsdir launchagentsdir LAUNCHD +TRADITIONALCPPFLAGS RAWCPPFLAGS RAWCPP AM_BACKSLASH @@ -796,9 +797,9 @@ with_xterm with_xserver with_xauth with_xinit +with_xinitdir with_wm with_xconsole -with_xinitdir with_launchd with_launchagents_dir with_launchagent_xserver @@ -1465,11 +1466,11 @@ Optional Packages: --with-xserver=XSERVER Path to default X server --with-xauth=XAUTH Path to xauth --with-xinit=XINIT Path to xinit + --with-xinitdir=XINITDIR + Path to xinitdir --with-wm=WM Path to default window manager --with-xconsole=XCONSOLE Path to xconsole - --with-xinitdir=XINITDIR - Path to xinitdir --with-launchd Build with support for Apple's launchd (default: auto) --with-launchagents-dir=PATH @@ -2794,7 +2795,7 @@ fi -# Require X.Org macros 1.8 or later for AC_PROG_SED in XORG_DEFAULT_OPTIONS +# Require X.Org macros 1.19 or later for TRADITIONALCPPFLAGS @@ -5783,6 +5784,55 @@ $as_echo "$supported" >&6; } fi fi + if test $found = "no" ; then + if test "x$xorg_testset_cc_unknown_warning_option" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unknown-warning-option" + fi + + if test "x$xorg_testset_cc_unused_command_line_argument" = "xyes" ; then + CFLAGS="$CFLAGS -Werror=unused-command-line-argument" + fi + + CFLAGS="$CFLAGS -fd" + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -fd" >&5 +$as_echo_n "checking if $CC supports -fd... " >&6; } + cacheid=xorg_cv_cc_flag__fd + if eval \${$cacheid+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +int i; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + eval $cacheid=yes +else + eval $cacheid=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi + + + CFLAGS="$xorg_testset_save_CFLAGS" + + eval supported=\$$cacheid + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 +$as_echo "$supported" >&6; } + if test "$supported" = "yes" ; then + BASE_CFLAGS="$BASE_CFLAGS -fd" + found="yes" + fi + fi + @@ -6337,11 +6387,11 @@ found="no" CFLAGS="$CFLAGS -Werror=unused-command-line-argument" fi - CFLAGS="$CFLAGS -Wcast-qual" + CFLAGS="$CFLAGS -Wmissing-noreturn" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wcast-qual" >&5 -$as_echo_n "checking if $CC supports -Wcast-qual... " >&6; } - cacheid=xorg_cv_cc_flag__Wcast_qual + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-noreturn" >&5 +$as_echo_n "checking if $CC supports -Wmissing-noreturn... " >&6; } + cacheid=xorg_cv_cc_flag__Wmissing_noreturn if eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else @@ -6372,7 +6422,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then - BASE_CFLAGS="$BASE_CFLAGS -Wcast-qual" + BASE_CFLAGS="$BASE_CFLAGS -Wmissing-noreturn" found="yes" fi fi @@ -6455,11 +6505,11 @@ found="no" CFLAGS="$CFLAGS -Werror=unused-command-line-argument" fi - CFLAGS="$CFLAGS -Wmissing-noreturn" + CFLAGS="$CFLAGS -Wmissing-format-attribute" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-noreturn" >&5 -$as_echo_n "checking if $CC supports -Wmissing-noreturn... " >&6; } - cacheid=xorg_cv_cc_flag__Wmissing_noreturn + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-format-attribute" >&5 +$as_echo_n "checking if $CC supports -Wmissing-format-attribute... " >&6; } + cacheid=xorg_cv_cc_flag__Wmissing_format_attribute if eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else @@ -6490,12 +6540,13 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then - BASE_CFLAGS="$BASE_CFLAGS -Wmissing-noreturn" + BASE_CFLAGS="$BASE_CFLAGS -Wmissing-format-attribute" found="yes" fi fi +# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wredundant-decls]) @@ -6573,11 +6624,11 @@ found="no" CFLAGS="$CFLAGS -Werror=unused-command-line-argument" fi - CFLAGS="$CFLAGS -Wmissing-format-attribute" + CFLAGS="$CFLAGS -Wlogical-op" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wmissing-format-attribute" >&5 -$as_echo_n "checking if $CC supports -Wmissing-format-attribute... " >&6; } - cacheid=xorg_cv_cc_flag__Wmissing_format_attribute + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wlogical-op" >&5 +$as_echo_n "checking if $CC supports -Wlogical-op... " >&6; } + cacheid=xorg_cv_cc_flag__Wlogical_op if eval \${$cacheid+:} false; then : $as_echo_n "(cached) " >&6 else @@ -6608,7 +6659,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supported" >&5 $as_echo "$supported" >&6; } if test "$supported" = "yes" ; then - BASE_CFLAGS="$BASE_CFLAGS -Wmissing-format-attribute" + BASE_CFLAGS="$BASE_CFLAGS -Wlogical-op" found="yes" fi fi @@ -6618,9 +6669,9 @@ $as_echo "$supported" >&6; } # These are currently disabled because they are noisy. They will be enabled # in the future once the codebase is sufficiently modernized to silence # them. For now, I don't want them to drown out the other warnings. -# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wlogical-op]) # XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wparentheses]) # XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-align]) +# XORG_TESTSET_CFLAG([[BASE_]PREFIX[FLAGS]], [-Wcast-qual]) # Turn some warnings into errors, so we don't accidently get successful builds # when there are problems that should be fixed. @@ -10553,6 +10604,7 @@ if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then $as_echo "no" >&6; } else if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then + TRADITIONALCPPFLAGS="-traditional" RAWCPPFLAGS="${RAWCPPFLAGS} -traditional" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -10565,6 +10617,7 @@ rm -f conftest.$ac_ext + # Build options DEFAULT_XRDB=xrdb DEFAULT_XMODMAP=xmodmap @@ -10575,8 +10628,8 @@ DEFAULT_XTERM=xterm DEFAULT_XSERVER=${bindir}/X DEFAULT_XAUTH=xauth DEFAULT_XINIT=xinit -DEFAULT_WM=fvwm DEFAULT_XINITDIR=${sysconfdir}/X11/xinit +DEFAULT_WM=fvwm DEFAULT_XCONSOLE=xconsole @@ -10652,6 +10705,15 @@ fi +# Check whether --with-xinitdir was given. +if test "${with_xinitdir+set}" = set; then : + withval=$with_xinitdir; XINITDIR="$withval" +else + XINITDIR="$DEFAULT_XINITDIR" +fi + + + # Check whether --with-wm was given. if test "${with_wm+set}" = set; then : withval=$with_wm; WM="$withval" @@ -10670,15 +10732,6 @@ fi -# Check whether --with-xinitdir was given. -if test "${with_xinitdir+set}" = set; then : - withval=$with_xinitdir; XINITDIR="$withval" -else - XINITDIR="$DEFAULT_XINITDIR" -fi - - - # Check whether --with-launchd was given. if test "${with_launchd+set}" = set; then : withval=$with_launchd; LAUNCHD=$withval @@ -11078,7 +11131,6 @@ esac - ac_config_files="$ac_config_files Makefile man/Makefile launchd/Makefile launchd/privileged_startx/Makefile launchd/user_startx/Makefile" cat >confcache <<\_ACEOF |