]>
Commit | Line | Data |
---|---|---|
e7ee2532 AM |
1 | diff -urbB gdome2-0.8.1.org/configure.in gdome2-0.8.1/configure.in |
2 | --- gdome2-0.8.1.org/configure.in 2003-10-05 16:39:27.000000000 +0200 | |
3 | +++ gdome2-0.8.1/configure.in 2005-10-16 22:21:46.704590000 +0200 | |
a964347c | 4 | @@ -57,24 +57,12 @@ |
e7ee2532 AM |
5 | dnl find glib |
6 | dnl | |
7 | ||
8 | -GLIB_1="no" | |
9 | -AC_ARG_ENABLE(glib-1, | |
10 | - [ --enable-glib-1=[no] Specify if you want to use glib 1], | |
11 | - GLIB_1=yes | |
12 | -) | |
13 | - | |
14 | -if test "x$GLIB_1" = "xyes" | |
15 | -then | |
16 | - PKG_CHECK_MODULES(GLIB, glib) | |
17 | - GLIB_REQUIRED="glib" | |
18 | - GLIB_MIN_VERSION=1.2.10 | |
19 | - AM_PATH_GLIB($GLIB_MIN_VERSION,,AC_MSG_ERROR(Could not find GLIB (see config.log for details).)) | |
20 | -else | |
21 | PKG_CHECK_MODULES(GLIB, glib-2.0) | |
a964347c | 22 | + GLIB_CONFIG="glib-config" |
e7ee2532 AM |
23 | GLIB_REQUIRED="glib-2.0" |
24 | GLIB_MIN_VERSION=2.2.0 | |
25 | AM_PATH_GLIB_2_0($GLIB_MIN_VERSION,,AC_MSG_ERROR(Could not find GLIB (see config.log for details).)) | |
26 | -fi | |
a964347c | 27 | +AC_SUBST(GLIB_CONFIG) |
e7ee2532 AM |
28 | AC_SUBST(GLIB_MIN_VERSION) |
29 | AC_SUBST(GLIB_LIBS) | |
30 | AC_SUBST(GLIB_REQUIRED) |