diff options
Diffstat (limited to 'editors/emacs/files/patch-configure')
| -rw-r--r-- | editors/emacs/files/patch-configure | 94 |
1 files changed, 25 insertions, 69 deletions
diff --git a/editors/emacs/files/patch-configure b/editors/emacs/files/patch-configure index 014058cf4714..dbe02b62c6da 100644 --- a/editors/emacs/files/patch-configure +++ b/editors/emacs/files/patch-configure @@ -3,7 +3,15 @@ $FreeBSD$ --- configure.orig +++ configure -@@ -8283,159 +8283,6 @@ +@@ -3238,6 +3238,7 @@ + as_fn_append ac_header_list " utmp.h" + as_fn_append ac_header_list " dirent.h" + as_fn_append ac_header_list " util.h" ++as_fn_append ac_header_list " libutil.h" + as_fn_append ac_header_list " sys/socket.h" + as_fn_append ac_header_list " stdlib.h" + as_fn_append ac_header_list " unistd.h" +@@ -8627,116 +8628,6 @@ LIBSOUND= fi @@ -14,48 +22,6 @@ $FreeBSD$ - - succeeded=no - -- # Extract the first word of "pkg-config", so it can be a program name with args. --set dummy pkg-config; ac_word=$2 --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 --$as_echo_n "checking for $ac_word... " >&6; } --if ${ac_cv_path_PKG_CONFIG+:} false; then : -- $as_echo_n "(cached) " >&6 --else -- case $PKG_CONFIG in -- [\\/]* | ?:[\\/]*) -- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. -- ;; -- *) -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then -- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" -- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done -- done --IFS=$as_save_IFS -- -- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" -- ;; --esac --fi --PKG_CONFIG=$ac_cv_path_PKG_CONFIG --if test -n "$PKG_CONFIG"; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 --$as_echo "$PKG_CONFIG" >&6; } --else -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 --$as_echo "no" >&6; } --fi -- -- -- - if test "$PKG_CONFIG" = "no" ; then - HAVE_ALSA=no - else @@ -64,30 +30,29 @@ $FreeBSD$ - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ALSA_MODULES" >&5 -$as_echo_n "checking for $ALSA_MODULES... " >&6; } - -- if $PKG_CONFIG --exists "$ALSA_MODULES" 2>&5; then -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 --$as_echo "yes" >&6; } +- if $PKG_CONFIG --exists "$ALSA_MODULES" 2>&5 && +- ALSA_CFLAGS=`$PKG_CONFIG --cflags "$ALSA_MODULES" 2>&5` && +- ALSA_LIBS=`$PKG_CONFIG --libs "$ALSA_MODULES" 2>&5`; then +- edit_cflags=" +- s,///*,/,g +- s/^/ / +- s/ -I/ $isystem/g +- s/^ // +- " +- ALSA_CFLAGS=`$as_echo "$ALSA_CFLAGS" | sed -e "$edit_cflags"` +- ALSA_LIBS=`$as_echo "$ALSA_LIBS" | sed -e 's,///*,/,g'` +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes CFLAGS='$ALSA_CFLAGS' LIBS='$ALSA_LIBS'" >&5 +-$as_echo "yes CFLAGS='$ALSA_CFLAGS' LIBS='$ALSA_LIBS'" >&6; } - succeeded=yes -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking ALSA_CFLAGS" >&5 --$as_echo_n "checking ALSA_CFLAGS... " >&6; } -- ALSA_CFLAGS=`$PKG_CONFIG --cflags "$ALSA_MODULES"|sed -e 's,///*,/,g'` -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ALSA_CFLAGS" >&5 --$as_echo "$ALSA_CFLAGS" >&6; } -- -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking ALSA_LIBS" >&5 --$as_echo_n "checking ALSA_LIBS... " >&6; } -- ALSA_LIBS=`$PKG_CONFIG --libs "$ALSA_MODULES"|sed -e 's,///*,/,g'` -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ALSA_LIBS" >&5 --$as_echo "$ALSA_LIBS" >&6; } - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - ALSA_CFLAGS="" - ALSA_LIBS="" - ## If we have a custom action on failure, don't print errors, but -- ## do set a variable so people can do so. -- ALSA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$ALSA_MODULES"` +- ## do set a variable so people can do so. Do it in a subshell +- ## to capture any diagnostics in invoking pkg-config. +- ALSA_PKG_ERRORS=`($PKG_CONFIG --print-errors "$ALSA_MODULES") 2>&1` - - fi - @@ -163,12 +128,3 @@ $FreeBSD$ if test x$have_sound_header = xyes || test $HAVE_ALSA = yes; then case "$opsys" in gnu-linux|freebsd|netbsd) -@@ -8453,7 +8300,7 @@ - linux/version.h sys/systeminfo.h \ - stdio_ext.h fcntl.h coff.h pty.h sys/mman.h \ - sys/vlimit.h sys/resource.h locale.h sys/_mbstate_t.h \ -- sys/utsname.h pwd.h utmp.h dirent.h util.h -+ sys/utsname.h pwd.h utmp.h dirent.h util.h libutil.h - do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` - ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" |