mirror of
https://git.freebsd.org/ports.git
synced 2025-07-02 10:00:37 -04:00
efb10588db
- Fix detection of 'make' program in use in configure script[1] - Use openpty(3) instead of deprecated pty(4) interface[2] - Add patch to interrupt `debug-on-quit' during loops[3] - Track ncurses dependency[4] PR: ports/160986[1], ports/161181[2], ports/161220[3], ports/161497[4] Submitted by: h h <aakusta@gmail.com>[1], Nali Toja <nalitoja@gmail.com>[2][3][4]
64 lines
2.6 KiB
Text
64 lines
2.6 KiB
Text
|
|
$FreeBSD$
|
|
|
|
--- configure.in.orig
|
|
+++ configure.in
|
|
@@ -1167,39 +1167,10 @@
|
|
AC_CHECK_LIB(ossaudio, _oss_ioctl, LIBSOUND=-lossaudio, LIBSOUND=)
|
|
AC_SUBST(LIBSOUND)
|
|
|
|
- ALSA_REQUIRED=1.0.0
|
|
- ALSA_MODULES="alsa >= $ALSA_REQUIRED"
|
|
- PKG_CHECK_MODULES(ALSA, $ALSA_MODULES, HAVE_ALSA=yes, HAVE_ALSA=no)
|
|
- if test $HAVE_ALSA = yes; then
|
|
- SAVE_CFLAGS="$CFLAGS"
|
|
- SAVE_LDFLAGS="$LDFLAGS"
|
|
- CFLAGS="$ALSA_CFLAGS $CFLAGS"
|
|
- LDFLAGS="$ALSA_LIBS $LDFLAGS"
|
|
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <asoundlib.h>]], [[snd_lib_error_set_handler (0);]])],
|
|
- emacs_alsa_normal=yes,
|
|
- emacs_alsa_normal=no)
|
|
- if test "$emacs_alsa_normal" != yes; then
|
|
- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <alsa/asoundlib.h>]],
|
|
- [[snd_lib_error_set_handler (0);]])],
|
|
- emacs_alsa_subdir=yes,
|
|
- emacs_alsa_subdir=no)
|
|
- if test "$emacs_alsa_subdir" != yes; then
|
|
- AC_MSG_ERROR([pkg-config found alsa, but it does not compile. See config.log for error messages.])
|
|
- 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"
|
|
- AC_DEFINE(HAVE_ALSA, 1, [Define to 1 if ALSA is available.])
|
|
- fi
|
|
-
|
|
dnl Define HAVE_SOUND if we have sound support. We know it works and
|
|
dnl compiles only on the specified platforms. For others, it
|
|
dnl probably doesn't make sense to try.
|
|
- if test x$have_sound_header = xyes || test $HAVE_ALSA = yes; then
|
|
+ if test x$have_sound_header = xyes; then
|
|
case "$opsys" in
|
|
dnl defined __FreeBSD__ || defined __NetBSD__ || defined __linux__
|
|
gnu-linux|freebsd|netbsd)
|
|
@@ -1216,7 +1187,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)
|
|
|
|
AC_MSG_CHECKING(if personality LINUX32 can be set)
|
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/personality.h>]], [[personality (PER_LINUX32)]])],
|
|
@@ -1369,7 +1340,7 @@ dnl check for GNU Make if we have GCC an
|
|
if test "$GCC" = yes && test "$ac_enable_autodepend" = yes; then
|
|
AC_MSG_CHECKING([whether we are using GNU Make])
|
|
HAVE_GNU_MAKE=no
|
|
- testval=`make --version 2>/dev/null | grep 'GNU Make'`
|
|
+ testval=`${MAKE:-make} --version 2>/dev/null | grep 'GNU Make'`
|
|
if test "x$testval" != x; then
|
|
HAVE_GNU_MAKE=yes
|
|
else
|