From: Fridrich S. <str...@us...> - 2008-11-25 21:02:26
|
Update of /cvsroot/libwpd/libwpd2-bindings In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv3689 Modified Files: configure.in Log Message: some more perfectionned checks Index: configure.in =================================================================== RCS file: /cvsroot/libwpd/libwpd2-bindings/configure.in,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- configure.in 23 Nov 2008 17:15:59 -0000 1.20 +++ configure.in 25 Nov 2008 21:02:19 -0000 1.21 @@ -76,11 +76,25 @@ AC_PROG_JAVA AC_PROG_JAR -AC_PATH_PROG(GMCS, gmcs, no) -if test "GMCS" = "no"; then +test x$GMCS = x && AC_PATH_PROG(GMCS, gmcs, no) +if test x$GMCS = xno; then AC_MSG_ERROR([*** Could not find C-sharp compiler that supports generics.]) fi +# The gacutil and mono can be besides gmcs +PATH="$PATH:`dirname $GMCS`" + +test x$GACUTIL = x && AC_PATH_PROG(GACUTIL, gacutil, no) +if test x$GACUTIL = xno; then + AC_MSG_WARN([Could not find gacutil. The resulting assemblies ]) + AC_MSG_WARN([will not be installed in Global Assembly Cache.]) +fi + +test x$MONO = x && AC_PATH_PROG(MONO, mono, no) +if test x$MONO = xno; then + AC_MSG_WARN([Could not find mono. The tests will possibly not run.]) +fi + AC_PROG_INSTALL AC_DISABLE_STATIC @@ -100,17 +114,18 @@ case "$host" in *-*-mingw*) native_win32=yes + AC_MSG_RESULT([$native_win32]) AC_CHECK_TOOL(WINDRES, windres) WPDJAVA_WIN32_RESOURCE=libwpd-java-win32res.lo WPDSHARP_WIN32_RESOURCE=libwpd-sharp-win32res.lo ;; *) native_win32=no + AC_MSG_RESULT([$native_win32]) WPDJAVA_WIN32_RESOURCE= WPDSHARP_WIN32_RESOURCE= ;; esac -AC_MSG_RESULT([$native_win32]) AM_CONDITIONAL(OS_WIN32, test "$native_win32" = yes) AC_SUBST(WPDJAVA_WIN32_RESOURCE) AC_SUBST(WPDSHARP_WIN32_RESOURCE) |