emacs: configure.in comparison

comparison configure.in @ 90732:bc10a33dd40b

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 563-582) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 177-185) - Merge from emacs--devo--0 - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-158

author	Miles Bader <miles@gnu.org>
date	Mon, 01 Jan 2007 03:21:06 +0000
parents	6588c6259dfb 86540ee6f1e4
children	95d0cdf160ea

comparison

equal deleted inserted replaced

-:a6c97c25a666
+:bc10a33dd40b
 dnl  You should have received a copy of the GNU General Public License
 dnl  along with GNU Emacs; see the file COPYING.  If not, write to the
 dnl  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 dnl  Boston, MA 02110-1301, USA.
-AC_PREREQ(2.54)dnl
+AC_PREREQ(2.61)dnl
 AC_INIT(src/lisp.h)
 AC_CONFIG_HEADER(src/config.h:src/config.in)
 dnl Support for --program-prefix, --program-suffix and
 dnl --program-transform-name options
 alpha*-*-netbsd*)	machine=alpha ;;
 i[3456]86-*-netbsd*) machine=intel386 ;;
 m68k-*-netbsd*)
 			# This is somewhat bogus.
 			machine=hp9000s300 ;;
-powerpc-apple-netbsd*) machine=macppc ;;
 mips-*-netbsd*)	machine=pmax ;;
 mipsel-*-netbsd*)	machine=pmax ;;
 mipseb-*-netbsd*)	machine=pmax ;;
 ns32k-*-netbsd*)	machine=ns32000 ;;
 powerpc-*-netbsd*) machine=macppc ;;
 sparc*-*-netbsd*)	machine=sparc ;;
 vax-*-netbsd*)	machine=vax ;;
 arm-*-netbsd*)	machine=arm ;;
+x86_64-*-netbsd*)	machine=amdx86-64 ;;
+hppa-*-netbsd*)	machine=hp800 ;;
+shle-*-netbsd*)	machine=sh3el ;;
 esac
 ;;
 ## OpenBSD ports
 *-*-openbsd* )
 if test "X${with_pkg_config_prog}" != X; then
 PKG_CONFIG="${with_pkg_config_prog}"
 fi
 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_TRY_COMPILE([#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_TRY_COMPILE([#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.])
+AC_SUBST()
 fi
 AC_SUBST(CFLAGS_SOUND)
 fi
 dnl checks for header files
 AC_MSG_RESULT(before 5)
 fi
 fi
 HAVE_GTK=no
+if test "${with_gtk}" = "yes" && test "$USE_X_TOOLKIT" = "gtk"; then
+USE_X_TOOLKIT=none
+fi
 if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk"; then
 if test "$USE_X_TOOLKIT" != "none" && test "$USE_X_TOOLKIT" != "maybe"; then
 AC_MSG_ERROR([Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}]);
 fi
 GLIB_REQUIRED=2.4
 AC_SUBST(GTK_CFLAGS)
 AC_SUBST(GTK_LIBS)
 C_SWITCH_X_SITE="$C_SWITCH_X_SITE $GTK_CFLAGS"
 CFLAGS="$CFLAGS $GTK_CFLAGS"
 LIBS="$GTK_LIBS $LIBS"
+dnl Try to compile a simple GTK program.
+GTK_COMPILES=no
+AC_CHECK_FUNCS(gtk_main, GTK_COMPILES=yes)
+if test "${GTK_COMPILES}" != "yes"; then
+AC_MSG_ERROR([Gtk+ wanted, but it does not compile, see config.log.  Maybe some x11-devel files missing?]);
+fi
 HAVE_GTK=yes
 AC_DEFINE(HAVE_GTK, 1, [Define to 1 if using GTK.])
 USE_X_TOOLKIT=none
 dnl  GTK scrollbars resemble toolkit scrollbars a lot, so to avoid

Mercurial > emacs

comparison configure.in @ 90732:bc10a33dd40b