2008-01-23 Jonathan Pobst <monkey@jpobst.com>

[mono.git] / configure.in

diff --git a/configure.in b/configure.in
index 90ffc85cf952f9e3ba908ae0addad2e35ad690f5..1bf9dd47c81760a94be4bbe6e7b368bccb62fac0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -451,14 +451,17 @@ 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'
+  GLIB_CFLAGS='-I$(top_srcdir)/eglib/src -I$(top_builddir)/eglib/src'
   GLIB_LIBS='-L$(top_builddir)/eglib/src -leglib -lm'
   BUILD_GLIB_CFLAGS="$GLIB_CFLAGS"
   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)
@@ -1980,6 +1984,20 @@ AC_ARG_WITH(moonlight,[ --with-moonlight=yes,no   If you want to build the Moonl
        fi
 ])
 
+OPROFILE=no
+AC_ARG_WITH(oprofile,[ --with-oprofile=no,<path>   Enable oprofile support (defaults to NO)],[
+       if test x$with_oprofile != xno; then
+             OPROFILE=yes
+             OPROFILE_CFLAGS="-I$with_oprofile/include"
+             OPROFILE_LIBS=
+             AC_DEFINE(HAVE_OPROFILE,1,[Have oprofile support])
+       fi
+])
+
+AM_CONDITIONAL(HAVE_OPROFILE, test x$OPROFILE = xyes)
+AC_SUBST(OPROFILE_CFLAGS)
+AC_SUBST(OPROFILE_LIBS)
+
 libmono_ldflags="$libmono_ldflags $LIBS"
 
 AM_CONDITIONAL(INSTALL_2_0, test x$PREVIEW = xyes)
@@ -2243,6 +2261,7 @@ echo "
        JNI support: $jdk_headers_found
        libgdiplus:  $libgdiplus_msg
        zlib:        $zlib_msg
+       oprofile:    $OPROFILE
        $disabled
 
 "