Ticket #45: galago-sharp-no-dbus-sharp.patch

  • configure.ac

    old new  
    115115    AC_MSG_ERROR([No gacutil tool found]) 
    116116fi 
    117117 
    118 dnl Check for the NUnit testing framework 
    119 have_nunit="yes" 
    120 AC_PATH_PROG(NUNIT, nunit-console) 
    121 AC_PATH_PROG(XSLTPROC, xsltproc) 
    122 if test "x$NUNIT" = "x" -o "x$XSLTPROC" = "x"; then 
    123     AC_MSG_WARN([Can't find NUnit and xsltproc. You will not be able to run unit tests]) 
     118dnl Check for dbus-sharp 
     119PKG_CHECK_EXISTS(dbus-sharp, have_dbus_sharp="yes", have_dbus_sharp="no") 
     120dnl dbus-sharp is only needed for the tests. Allow building without them. 
     121if test "$have_dbus_sharp" = "no"; then 
     122    AC_MSG_WARN([Can't find dbus-sharp. Test programs will not be built]) 
     123    dnl no need to check for NUnit, the unit tests won't work without dbus-sharp 
    124124    have_nunit="no" 
     125else 
     126    dnl Check for the NUnit testing framework 
     127    have_nunit="yes" 
     128    AC_PATH_PROG(NUNIT, nunit-console) 
     129    AC_PATH_PROG(XSLTPROC, xsltproc) 
     130    if test "x$NUNIT" = "x" -o "x$XSLTPROC" = "x"; then 
     131        AC_MSG_WARN([Can't find NUnit and xsltproc. You will not be able to run unit tests]) 
     132        have_nunit="no" 
     133    fi 
    125134fi 
     135AM_CONDITIONAL(HAVE_DBUS_SHARP, test "$have_dbus_sharp" = "yes") 
    126136AM_CONDITIONAL(HAVE_NUNIT, test "$have_nunit" = "yes") 
    127137 
    128138AC_SUBST(RUNTIME) 
  • Makefile.am

    old new  
    1 SUBDIRS = sources galago tests 
     1SUBDIRS = sources galago 
     2 
     3if HAVE_DBUS_SHARP 
     4SUBDIRS += tests 
     5endif 
    26 
    37pcdata_DATA = galago-sharp.pc 
    48pcdatadir = $(libdir)/pkgconfig