add check for glib 2.x

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1592 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index aeba70172542e6f7c996d34b8650062aa9e8b6aa..47161f3e27cb10bd4404e7a01cc88831b00afe67 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,8 @@ CVS code -
   get_accepted_kbinput()
        - Translate Ctrl-8 into NANO_DELETE_KEY, since it apparently is
          generated at the statusbar prompt sometimes on Linux. (DLR)
+- configure.ac:
+       - Check for glib 2.x and then 1.2.x if we need glib. (DLR)
 - nano.spec.in:
        - Update for the 1.3 branch of nano. (DLR)
 - THANKS:

diff --git a/configure.ac b/configure.ac
index e9eef44b99b74f84ba9b2272019838ebb75c81dc..31ccd2220daf52f6406f75c1d0c13730e648e9de 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -273,14 +273,13 @@ dnl Checks for functions
 AC_CHECK_FUNCS(snprintf vsnprintf strcasecmp strncasecmp)
 if test "x$ac_cv_func_snprintf" = "xno" -o "xac_cv_func_vsnprintf" = "xno"
 then
-       AM_PATH_GLIB(1.2.4,,
-           [AC_MSG_ERROR([
+       AM_PATH_GLIB_2_0(2.0.0,,
+           [AM_PATH_GLIB(1.2.4,,
+               [AC_MSG_ERROR([
 *** snprintf() and/or vsnprintf() not found.  GLIB not found either.
 *** You need both snprintf() and vsnprintf().  Alternatively you can
 *** install the GLIB library which can be found at ftp://ftp.gtk.org/.])],
-           glib)
-       glib_cflags=`$GLIB_CONFIG --cflags glib`
-       glib_libs=`$GLIB_CONFIG --libs glib`
+               glib)])
 fi
 
 dnl Checks for typedefs, structures, and compiler characteristics.
@@ -338,13 +337,13 @@ LIBS="$LIBS $CURSES_LIB"
 
 AC_SUBST(CURSES_LIB)
 
-if test "x$glib_cflags" != "x"
+if test "x$GLIB_CFLAGS" != "x"
 then
-       CFLAGS="$CFLAGS $glib_cflags"
+       CFLAGS="$CFLAGS $GLIB_CFLAGS"
 fi
-if test "x$glib_libs" != "x"
+if test "x$GLIB_LIBS" != "x"
 then
-       LDFLAGS="$LDFLAGS $glib_libs"
+       LDFLAGS="$LDFLAGS $GLIB_LIBS"
 fi
 
 AC_CONFIG_FILES([