clean up conditionals a little, add defines for hal/udisks mount
clean up conditionals a little, add defines for hal/udisks mount


SVN revision: 55832

FlorentRevest/Enlightenment,rvandegrift/e,rvandegrift/e,FlorentRevest/Enlightenment,tasn/enlightenment,rvandegrift/e,tasn/enlightenment,FlorentRevest/Enlightenment,tizenorg/platform.upstream.enlightenment,tizenorg/platform.upstream.enlightenment,tasn/enlightenment,tizenorg/platform.upstream.enlightenment