mirror of
https://git.freebsd.org/ports.git
synced 2025-07-09 05:19:16 -04:00
7fc5bd70f3
editors/emacs: - Update to 24.3 - Update CANNA patchset[1] - Unbreak ARM support by using the patch from emacs-devel port - Add missing INSTALLS_ICONS[2] - Remove a patch which is already integrated upstream - Fix Makefile header editors/emacs-devel: - Update to bzr revision 112178 - Fix Makefile header - Add missing INSTALLS_ICONS[2] editors/emacs23: - Remove ABI versions from LIB_DEPENDS - Fix Makefile header - Add missing INSTALLS_ICONS[2] Mk/bsd.emacs.mk: - Update major version for editors/emacs port *: - Bump PORTREVISION to chase Emacs updates PR: ports/177428[2] Submitted by: Yuji TAKANO[1] (via private email), bdrewery[2]
55 lines
2.1 KiB
Text
55 lines
2.1 KiB
Text
|
|
$FreeBSD$
|
|
|
|
--- configure.ac.orig
|
|
+++ configure.ac
|
|
@@ -1150,39 +1150,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_LIBS="$LIBS"
|
|
- CFLAGS="$ALSA_CFLAGS $CFLAGS"
|
|
- LIBS="$ALSA_LIBS $LIBS"
|
|
- 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"
|
|
- LIBS="$SAVE_LIBS"
|
|
- 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)
|
|
@@ -1199,7 +1170,7 @@
|
|
linux/version.h sys/systeminfo.h
|
|
coff.h pty.h
|
|
sys/resource.h
|
|
- sys/utsname.h pwd.h utmp.h util.h)
|
|
+ sys/utsname.h pwd.h utmp.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)]])],
|