2008-01-05 Andreas Faerber <andreas.faerber@web.de>

	* configure.in: Define eglib_dir.
	* Makefile.am: Add eglib to subdirectory lists.

svn path=/trunk/mono/; revision=92299

diff --git a/ChangeLog b/ChangeLog
index 38b4ec9b325da7cb60e2255543937d5a7fab5bae..6c436fb83ebd6636b366aa2d19afae9367161b43 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-05  Andreas Faerber  <andreas.faerber@web.de>
+
+       * configure.in: Define eglib_dir.
+       * Makefile.am: Add eglib to subdirectory lists.
+
 2007-12-31  Jonathan Chambers  <joncham@gmail.com>
 
        * winconfig.h: Define HAVE_GETPROCESSID.

diff --git a/Makefile.am b/Makefile.am
index 12af7d609bc94bdbd6019e72e12a830f269360d2..5b45e5199231bfbc0740b8b7a5e3eb5204af9098 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,11 @@
 AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I .
 
-SUBDIRS = $(libgc_dir) mono $(ikvm_native_dir) support docs data runtime scripts man samples web msvc
+SUBDIRS = $(libgc_dir) $(eglib_dir) mono $(ikvm_native_dir) support docs data runtime scripts man samples web msvc
 
 # Keep in sync with SUBDIRS
 ## 'tools' is not normally built
-DIST_SUBDIRS = libgc mono ikvm-native support docs data runtime scripts man samples web tools msvc
+DIST_SUBDIRS = libgc eglib mono ikvm-native support docs data runtime scripts man samples web tools msvc
 
 EXTRA_DIST= mono-uninstalled.pc.in LICENSE
 

diff --git a/configure.in b/configure.in
index 90d4bd1e235375de654d0fb4e615f720b77bebda..04d74e13a05d19cb71337db1994e4b1de09ea7c8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -451,6 +451,8 @@ AC_ARG_WITH([glib],
        [  --with-glib=embedded|system       Choose glib API: system or embedded (default to system)],
        [], [with_glib=system])
 
+eglib_dir=
+
 case $with_glib in
 embedded) 
   GLIB_CFLAGS='-I$(top_srcdir)/eglib/src'
@@ -459,6 +461,7 @@ embedded)
   BUILD_GLIB_LIBS="$GLIB_LIBS"
   GMODULE_CFLAGS="$GLIB_CFLAGS"
   GMODULE_LIBS="$GLIB_LIBS"
+  eglib_dir=eglib
   AC_CONFIG_SUBDIRS(eglib)
   ;;
 system)
@@ -486,6 +489,7 @@ AC_SUBST(GMODULE_CFLAGS)
 AC_SUBST(GMODULE_LIBS)
 AC_SUBST(BUILD_GLIB_CFLAGS)
 AC_SUBST(BUILD_GLIB_LIBS)
+AC_SUBST(eglib_dir)
 
 if test x$cross_compiling$platform_win32 = xnoyes; then
    AC_MSG_CHECKING(for cygwin glib2-dev package)