--- a/configure.ac
+++ b/configure.ac
@@ -15,12 +15,34 @@
[Set the path for the directory where ohNet, ohNetGenerated, ohdevtools,
ohTopology and ohSongcast were extracted and built]),
withOH=$withval, withOH=no)
+TOPOH="$withOH"
+AM_CONDITIONAL(WITH_OHBUILD, [test X$withOH != Xno])
+AC_SUBST(TOPOH)
-if test X$withOH = Xno ; then
+AC_ARG_WITH(ohnet,
+ AC_HELP_STRING([--with-ohnet=topOhNetDir],
+ [Specify dir prefix where ohNet is installed]),
+ withOhNet=$withval, withOhNet=no)
+TOPOHNET="$withOhNet"
+AC_SUBST(TOPOHNET)
+
+AC_ARG_WITH(ohnetgenerated,
+ AC_HELP_STRING([--with-ohnetgenerated=topOhNetGeneratedDir],
+ [Specify dir prefix where ohNetGenerated is installed]),
+ withOhNetGenerated=$withval, withOhNetGenerated=no)
+TOPOHNETGENERATED="$withOhNetGenerated"
+AC_SUBST(TOPOHNETGENERATED)
+
+AC_ARG_WITH(ohsongcast,
+ AC_HELP_STRING([--with-ohsongcast=topOhSongcastDir],
+ [Specify dir prefix where ohSongcast is installed]),
+ withOhSongcast=$withval, withOhSongcast=no)
+TOPOHSONGCAST="$withOhSongcast"
+AC_SUBST(TOPOHSONGCAST)
+
+if test X$withOH = Xno -a X$ohnet = Xno; then
AC_MSG_ERROR([Please provide the location for the OpenHome sources and libraries])
fi
-TOPOH="$withOH"
-AC_SUBST(TOPOH)
# Enable wav-reading test code in sc2mpd. Devel only
AC_ARG_ENABLE(wavsc2,