diff options
Diffstat (limited to 'app/xrandr/configure')
| -rw-r--r-- | app/xrandr/configure | 102 |
1 files changed, 23 insertions, 79 deletions
diff --git a/app/xrandr/configure b/app/xrandr/configure index 569537bc2..cbdb5a50b 100644 --- a/app/xrandr/configure +++ b/app/xrandr/configure @@ -3056,9 +3056,6 @@ echo "$as_me:$LINENO: checking for XRANDR" >&5 echo $ECHO_N "checking for XRANDR... $ECHO_C" >&6 if test -n "$PKG_CONFIG"; then - if test -n "$XRANDR_CFLAGS"; then - pkg_cv_XRANDR_CFLAGS="$XRANDR_CFLAGS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xrandr xrender x11\"") >&5 ($PKG_CONFIG --exists --print-errors "xrandr xrender x11") 2>&5 @@ -3069,14 +3066,10 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi if test -n "$PKG_CONFIG"; then - if test -n "$XRANDR_LIBS"; then - pkg_cv_XRANDR_LIBS="$XRANDR_LIBS" - else if test -n "$PKG_CONFIG" && \ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xrandr xrender x11\"") >&5 ($PKG_CONFIG --exists --print-errors "xrandr xrender x11") 2>&5 @@ -3087,59 +3080,38 @@ if test -n "$PKG_CONFIG"; then else pkg_failed=yes fi - fi else pkg_failed=untried fi - - if test $pkg_failed = yes; then - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - XRANDR_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xrandr xrender x11"` - else - XRANDR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xrandr xrender x11"` - fi + XRANDR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xrandr xrender x11"` # Put the nasty error message in config.log where it belongs - echo "$XRANDR_PKG_ERRORS" >&5 - - { { echo "$as_me:$LINENO: error: Package requirements (xrandr xrender x11) were not met: - -$XRANDR_PKG_ERRORS + echo "$XRANDR_PKG_ERRORS" 1>&5 + { { echo "$as_me:$LINENO: error: Package requirements (xrandr xrender x11) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables XRANDR_CFLAGS -and XRANDR_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&5 -echo "$as_me: error: Package requirements (xrandr xrender x11) were not met: - -$XRANDR_PKG_ERRORS - +Alternatively you may set the XRANDR_CFLAGS and XRANDR_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details." >&5 +echo "$as_me: error: Package requirements (xrandr xrender x11) were not met. Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. -Alternatively, you may set the environment variables XRANDR_CFLAGS -and XRANDR_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&2;} +Alternatively you may set the XRANDR_CFLAGS and XRANDR_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details." >&2;} { (exit 1); exit 1; }; } elif test $pkg_failed = untried; then { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables XRANDR_CFLAGS -and XRANDR_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +Alternatively you may set the XRANDR_CFLAGS and XRANDR_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&5 @@ -3147,9 +3119,9 @@ echo "$as_me: error: The pkg-config script could not be found or is too old. Ma is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. -Alternatively, you may set the environment variables XRANDR_CFLAGS -and XRANDR_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. +Alternatively you may set the XRANDR_CFLAGS and XRANDR_LIBS environment variables +to avoid the need to call pkg-config. See the pkg-config man page for +more details. To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>. See \`config.log' for more details." >&2;} @@ -3222,75 +3194,47 @@ host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` if test x$APP_MAN_SUFFIX = x ; then - case $host_os in - linux*) APP_MAN_SUFFIX=1x ;; - *) APP_MAN_SUFFIX=1 ;; - esac + APP_MAN_SUFFIX=1 fi if test x$APP_MAN_DIR = x ; then - case $host_os in - linux*) APP_MAN_DIR='$(mandir)/man1' ;; - *) APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' ;; - esac + APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' fi if test x$LIB_MAN_SUFFIX = x ; then - case $host_os in - linux*) LIB_MAN_SUFFIX=3x ;; - *) LIB_MAN_SUFFIX=3 ;; - esac + LIB_MAN_SUFFIX=3 fi if test x$LIB_MAN_DIR = x ; then - case $host_os in - linux*) LIB_MAN_DIR='$(mandir)/man3' ;; - *) LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' ;; - esac + LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' fi if test x$FILE_MAN_SUFFIX = x ; then case $host_os in - linux*) FILE_MAN_SUFFIX=5x ;; solaris*) FILE_MAN_SUFFIX=4 ;; *) FILE_MAN_SUFFIX=5 ;; esac fi if test x$FILE_MAN_DIR = x ; then - case $host_os in - linux*) FILE_MAN_DIR='$(mandir)/man5' ;; - *) FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' ;; - esac + FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' fi -# In Imake's linux.cf, the misc man suffix & dir was only changed for -# LinuxDebian, not other Linuxes, so we leave it unchanged here if test x$MISC_MAN_SUFFIX = x ; then case $host_os in -# linux*) MISC_MAN_SUFFIX=7x ;; solaris*) MISC_MAN_SUFFIX=5 ;; *) MISC_MAN_SUFFIX=7 ;; esac fi if test x$MISC_MAN_DIR = x ; then - case $host_os in -# linux*) MISC_MAN_DIR='$(mandir)/man7' ;; - *) MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)' ;; - esac + MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)' fi -# In Imake's linux.cf, the driver man suffix & dir was only changed for -# LinuxDebian, not other Linuxes, so we leave it unchanged here if test x$DRIVER_MAN_SUFFIX = x ; then case $host_os in -# linux*) DRIVER_MAN_SUFFIX=4x ;; solaris*) DRIVER_MAN_SUFFIX=7 ;; *) DRIVER_MAN_SUFFIX=4 ;; esac fi if test x$DRIVER_MAN_DIR = x ; then - case $host_os in -# linux*) DRIVER_MAN_DIR='$(mandir)/man4' ;; - *) DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)' ;; - esac + DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)' fi if test x$ADMIN_MAN_SUFFIX = x ; then |