comparison configure.in @ 251:18ecaae9cc3b

Changed configure to make sure we find gtk 2.0, and not just pkg-config, when checking for GTK 2.x versus GTK 1.x.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Wed, 19 Feb 2003 17:26:41 +0000
parents 4c4e94a63748
children a8015e02b590
comparison
equal deleted inserted replaced
250:967b8cd9deb4 251:18ecaae9cc3b
48 AC_CHECK_LIB(sun, getpwnam, LIBS="$LIBS -lsun",) 48 AC_CHECK_LIB(sun, getpwnam, LIBS="$LIBS -lsun",)
49 AC_CHECK_LIB(dgc, inet_addr, LIBS="$LIBS -ldgc",) 49 AC_CHECK_LIB(dgc, inet_addr, LIBS="$LIBS -ldgc",)
50 AC_CHECK_LIB(resolv, gethostbyname, LIBS="$LIBS -lresolv",) 50 AC_CHECK_LIB(resolv, gethostbyname, LIBS="$LIBS -lresolv",)
51 51
52 AC_CHECK_PROG(PKG_CFG, pkg-config, pkg-config) 52 AC_CHECK_PROG(PKG_CFG, pkg-config, pkg-config)
53 if test x"$PKG_CFG" = x; then 53 if test x"$PKG_CFG" != x; then
54 GTK_LIBS=`$PKG_CFG --silence-errors --libs gtk+-2.0 gthread-2.0`
55 fi
56
57 if test x"$GTK_LIBS" = x; then
54 AM_PATH_GLIB(1.2.0,,AC_MSG_ERROR(AC_MSG_ERROR(Cannot find GLIB: Is glib-config in path?))) 58 AM_PATH_GLIB(1.2.0,,AC_MSG_ERROR(AC_MSG_ERROR(Cannot find GLIB: Is glib-config in path?)))
55 AM_PATH_GTK(1.2.0,,AC_MSG_ERROR(AC_MSG_ERROR(Cannot find GTK: Is gtk-config in path?)), gthread) 59 AM_PATH_GTK(1.2.0,,AC_MSG_ERROR(AC_MSG_ERROR(Cannot find GTK: Is gtk-config in path?)), gthread)
56 AM_PATH_GDK_IMLIB(1.9.4, AC_DEFINE(USE_IMLIB), AC_MSG_ERROR(IMLIB not found or too old. Dynamic Windows cannot build without it.)) 60 AM_PATH_GDK_IMLIB(1.9.4, AC_DEFINE(USE_IMLIB), AC_MSG_ERROR(IMLIB not found or too old. Dynamic Windows cannot build without it.))
57 else 61 else
58 GTK_CFLAGS=`$PKG_CFG --cflags gtk+-2.0 gthread-2.0` 62 GTK_CFLAGS=`$PKG_CFG --cflags gtk+-2.0 gthread-2.0`