diff options
Diffstat (limited to 'editors/emacs23/files/patch-configure')
| -rw-r--r-- | editors/emacs23/files/patch-configure | 220 |
1 files changed, 220 insertions, 0 deletions
diff --git a/editors/emacs23/files/patch-configure b/editors/emacs23/files/patch-configure new file mode 100644 index 000000000000..e9da46794704 --- /dev/null +++ b/editors/emacs23/files/patch-configure @@ -0,0 +1,220 @@ + +$FreeBSD$ + +--- configure.orig ++++ configure +@@ -6433,214 +6433,8 @@ + + + +- ALSA_REQUIRED=1.0.0 +- ALSA_MODULES="alsa >= $ALSA_REQUIRED" +- +- 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:$LINENO: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_PKG_CONFIG+set}" = set; 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:$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:$LINENO: result: $PKG_CONFIG" >&5 +-$as_echo "$PKG_CONFIG" >&6; } +-else +- { $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +- +- if test "$PKG_CONFIG" = "no" ; then +- HAVE_ALSA=no +- else +- PKG_CONFIG_MIN_VERSION=0.9.0 +- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then +- { $as_echo "$as_me:$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:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } +- succeeded=yes +- +- { $as_echo "$as_me:$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:$LINENO: result: $ALSA_CFLAGS" >&5 +-$as_echo "$ALSA_CFLAGS" >&6; } +- +- { $as_echo "$as_me:$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:$LINENO: result: $ALSA_LIBS" >&5 +-$as_echo "$ALSA_LIBS" >&6; } +- else +- { $as_echo "$as_me:$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"` +- +- fi +- +- +- +- else +- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." +- echo "*** See http://www.freedesktop.org/software/pkgconfig" +- fi +- fi +- +- if test $succeeded = yes; then +- HAVE_ALSA=yes +- else +- HAVE_ALSA=no +- fi +- +- if test $HAVE_ALSA = yes; then +- SAVE_CFLAGS="$CFLAGS" +- SAVE_LDFLAGS="$LDFLAGS" +- CFLAGS="$ALSA_CFLAGS $CFLAGS" +- LDFLAGS="$ALSA_LIBS $LDFLAGS" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <asoundlib.h> +-int +-main () +-{ +-snd_lib_error_set_handler (0); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- emacs_alsa_normal=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- emacs_alsa_normal=no + fi + +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- if test "$emacs_alsa_normal" != yes; then +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +-#include <alsa/asoundlib.h> +-int +-main () +-{ +-snd_lib_error_set_handler (0); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_compile") 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { +- test -z "$ac_c_werror_flag" || +- test ! -s conftest.err +- } && test -s conftest.$ac_objext; then +- emacs_alsa_subdir=yes +-else +- $as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +- emacs_alsa_subdir=no +-fi +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- if test "$emacs_alsa_subdir" != yes; then +- { { $as_echo "$as_me:$LINENO: error: pkg-config found alsa, but it does not compile. See config.log for error messages." >&5 +-$as_echo "$as_me: error: pkg-config found alsa, but it does not compile. See config.log for error messages." >&2;} +- { (exit 1); exit 1; }; } +- fi +- ALSA_CFLAGS="$ALSA_CFLAGS -DALSA_SUBDIR_INCLUDE" +- fi +- +- CFLAGS="$SAVE_CFLAGS" +- LDFLAGS="$SAVE_LDFLAGS" +- LIBSOUND="$LIBSOUND $ALSA_LIBS" +- CFLAGS_SOUND="$CFLAGS_SOUND $ALSA_CFLAGS" +- +-cat >>confdefs.h <<\_ACEOF +-#define HAVE_ALSA 1 +-_ACEOF +- +- fi +- +-fi +- +- + + + |