summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--configure.in35
1 files changed, 15 insertions, 20 deletions
diff --git a/configure.in b/configure.in
index 46282d8..2c6ffc2 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
# Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
#
-# $Id: configure.in,v 1.31 2004/06/12 00:50:25 jao Exp $
+# $Id: configure.in,v 1.32 2004/06/23 10:40:50 jao Exp $
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
@@ -10,8 +10,8 @@
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-AC_INIT([GNU MDK],1.1,[bug-mdk@gnu.org],mdk)
-AM_INIT_AUTOMAKE(mdk,1.1)
+AC_INIT([GNU MDK],1.2,[bug-mdk@gnu.org],mdk)
+AM_INIT_AUTOMAKE(mdk,1.2)
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE
@@ -35,7 +35,7 @@ AC_DEFINE_UNQUOTED(LOCALEDIR, "${prefix}/share/locale")
dnl Check for readline and history
AC_ARG_WITH(readline,
-[ --with-readline build mixvm with readline support],
+[ --without-readline build mixvm without readline support],
[case "${withval}" in
yes) readl=true ;;
no) readl=false ;;
@@ -62,7 +62,7 @@ fi
dnl Check for guile
AC_ARG_WITH(guile,
-[ --with-guile build MDK with Guile support],
+[ --without-guile build MDK without Guile support],
[case "${withval}" in
yes) wguile=true ;;
no) wguile=false ;;
@@ -90,14 +90,14 @@ fi
AM_CONDITIONAL(MAKE_GUILE, test x$wguile = xtrue)
dnl Check for glib
-dnl AM_PATH_GLIB_2_0(2.0.0,
-AM_PATH_GLIB(1.2.0,
- [LIBS="$LIBS $GLIB_LIBS" CFLAGS="$CFLAGS $GLIB_CFLAGS"],
- AC_MSG_ERROR(Cannot find GLIB), "gmodule" )
+PKG_CHECK_MODULES(GLIB,glib-2.0 >= 2.0)
+
+LIBS="$LIBS $GLIB_LIBS"
+CFLAGS="$CFLAGS $GLIB_CFLAGS -DG_DISABLE_DEPRECATED"
dnl Check if the gtk gui is required
AC_ARG_ENABLE(gui,
-[ --enable-gui build the GTK+ GUI for mixvm (gmixvm)],
+[ --disable-gui do not build the GTK+ GUI for mixvm (gmixvm)],
[case "${enableval}" in
yes) gui=true ;;
no) gui=false ;;
@@ -106,19 +106,14 @@ esac],[gui=true])
dnl Check for gtk+
if test x$gui = xtrue; then
-dnl AM_PATH_GTK_2_0(2.0.0,
-AM_PATH_GTK(1.2.0,
-[LIBS="$LIBS $GTK_LIBS" CFLAGS="$CFLAGS $GTK_CFLAGS"],
-[AC_MSG_WARN(Cannot find GTK+: the GUI shall not be built)
- gui=false],
-"gmodule" )
+PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4.0 libglade-2.0 >= 2.0.0,
+ [LIBS="$LIBS $GTK_LIBS" CFLAGS="$CFLAGS $GTK_CFLAGS"],
+ [AC_MSG_WARN(Cannot find GTK+: the GUI shall not be built)
+ gui=false])
fi
-dnl Check for libglade
if test x$gui = xtrue; then
- AM_PATH_LIBGLADE([LIBS="$LIBS $LIBGLADE_LIBS"
- CFLAGS="$CFLAGS $LIBGLADE_CFLAGS"],
- gui=false)
+CFLAGS="$CFLAGS -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED"
fi
dnl use the provided getopt if gnu getopt is not available