diff options
| author | Miguel de Icaza <miguel@gnome.org> | 2006-08-16 04:04:54 +0400 |
|---|---|---|
| committer | Miguel de Icaza <miguel@gnome.org> | 2006-08-16 04:04:54 +0400 |
| commit | 14eaf0cdb1b8519d593ea8a55feafae3344ee587 (patch) | |
| tree | 93a4620021ed6ca959a583d406191d0e6bd7e236 | |
| parent | b9c6428886c50a6961bbaaaad50d641dfba1935c (diff) | |
2006-08-15 Miguel de Icaza <miguel@novell.com>
* configure.in: Add support for an altenative version of glib.
svn path=/trunk/mono/; revision=63795
| -rw-r--r-- | configure.in | 47 |
1 files changed, 30 insertions, 17 deletions
diff --git a/configure.in b/configure.in index 915ac68828e..0432bc4307c 100644 --- a/configure.in +++ b/configure.in @@ -390,13 +390,6 @@ if test "x$PKG_CONFIG" = "xno"; then AC_MSG_ERROR([You need to install pkg-config]) fi -dnl for use on the build system -dnl pkg-config is stupid -BUILD_GLIB_CFLAGS=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0` -BUILD_GLIB_LIBS=`$PKG_CONFIG --libs glib-2.0 gthread-2.0` -AC_SUBST(BUILD_GLIB_CFLAGS) -AC_SUBST(BUILD_GLIB_LIBS) - pkg_config_path= AC_ARG_WITH(crosspkgdir, [ --with-crosspkgdir=/path/to/pkg-config/dir], if test x$with_crosspkgdir = "x"; then @@ -410,16 +403,36 @@ AC_ARG_WITH(crosspkgdir, [ --with-crosspkgdir=/path/to/pkg-config/dir], fi ) -## Versions of dependencies -GLIB_REQUIRED_VERSION=1.3.11 - -PKG_CHECK_MODULES(BASE_DEPENDENCIES, glib-2.0 >= $GLIB_REQUIRED_VERSION) - -GLIB_CFLAGS=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0` -GLIB_LIBS=`$PKG_CONFIG --libs glib-2.0 gthread-2.0` -GMODULE_CFLAGS=`$PKG_CONFIG --cflags gmodule-2.0` -GMODULE_LIBS=`$PKG_CONFIG --libs gmodule-2.0` - +AC_ARG_WITH([glib], + [ --with-glib=embedded|system Choose glib API: system or embedded (default to system)], + [], [with_glib=system]) + +case $with_glib in +embedded) + GLIB_CFLAGS='-I$(top_srcdir)/eglib/src' + GLIB_LIBS='-L$(top_builddir)/eglib/src -leglib' + AC_CONFIG_SUBDIRS(eglib) + ;; +system) + BUILD_GLIB_CFLAGS=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0` + BUILD_GLIB_LIBS=`$PKG_CONFIG --libs glib-2.0 gthread-2.0` + AC_SUBST(BUILD_GLIB_CFLAGS) + AC_SUBST(BUILD_GLIB_LIBS) + + ## Versions of dependencies + GLIB_REQUIRED_VERSION=1.3.11 + + PKG_CHECK_MODULES(BASE_DEPENDENCIES, glib-2.0 >= $GLIB_REQUIRED_VERSION) + + GLIB_CFLAGS=`$PKG_CONFIG --cflags glib-2.0 gthread-2.0` + GLIB_LIBS=`$PKG_CONFIG --libs glib-2.0 gthread-2.0` + GMODULE_CFLAGS=`$PKG_CONFIG --cflags gmodule-2.0` + GMODULE_LIBS=`$PKG_CONFIG --libs gmodule-2.0` + ;; +*) + AC_MSG_ERROR([Invalid argument to --with-glib.]) +esac + AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_LIBS) AC_SUBST(GMODULE_CFLAGS) |