CVS commit by waba: Disable konference if required libs are not available. A configure.in.bot 1.1 M +28 -10 configure.in.in 1.5 --- kdenonbeta/konference/configure.in.in #1.4:1.5 @@ -48,4 +48,6 @@ HAS_SPEEX="disabled" +konference_error="none" + case $target_os in @@ -73,5 +75,5 @@ ;; *) - AC_MSG_ERROR("Only Linux and FreeBSD are supported. Please contact the author. You can add more OS types.") + konference_error="Only Linux and FreeBSD are supported. Please contact the author. You can add more OS types." ;; esac @@ -97,5 +99,7 @@ fi else - AC_MSG_ERROR(You need the PWLib headers to compile Konference) + if test "x${konference_error}" == "xnone" ; then + konference_error="You need the PWLib headers to compile Konference" + fi fi @@ -111,5 +115,7 @@ fi else - AC_MSG_ERROR(You need the PWLib library to compile Konference) + if test "x${konference_error}" == "xnone" ; then + konference_error="You need the PWLib library to compile Konference" + fi fi @@ -128,10 +134,11 @@ AC_CHECK_FILE(${with_pwlib_dir}/bin/ptlib-config, HAS_PTLIB_CONFIG=1) if test "x${HAS_PTLIB_CONFIG}" != "x1" ; then - AC_MSG_ERROR(Sorry but ptlib-config can not be found, please check your installation); + if test "x${konference_error}" == "xnone" ; then + konference_error="Sorry but ptlib-config can not be found, please check your installation" + fi else AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , ${with_pwlib_dir}/bin/) + ARCH_OPENH323_CFLAGS="$ARCH_OPENH323_CFLAGS `$PTLIB_CONFIG --ccflags`" fi -ARCH_OPENH323_CFLAGS="$ARCH_OPENH323_CFLAGS `$PTLIB_CONFIG --ccflags`" - dnl ########################################################################### @@ -152,5 +159,7 @@ OPENH323_CFLAGS="-I${with_openh323_dir}/include/openh323" else - AC_MSG_ERROR(You need the Openh323 headers to compile Konference) + if test "x${konference_error}" == "xnone" ; then + konference_error="You need the Openh323 headers to compile Konference" + fi fi @@ -166,5 +175,7 @@ fi else - AC_MSG_ERROR(You need the Openh323 library to compile Konference) + if test "x${konference_error}" == "xnone" ; then + konference_error="You need the Openh323 library to compile Konference" + fi fi @@ -184,5 +195,7 @@ if test "x${OPENH323_IXJ_SUPPORT}" != "x1"; then AC_MSG_RESULT(no); - AC_MSG_ERROR(Sorry but the OpenH323 version you are using doesn't support Quicknet devices); + if test "x${konference_error}" == "xnone" ; then + konference_error="Sorry but the OpenH323 version you are using doesn't support Quicknet devices" + fi else AC_MSG_RESULT(yes); @@ -193,7 +206,12 @@ KDE_CHECK_SSL if test "x$have_ssl" = xno; then - AC_MSG_ERROR(Sorry but the OpenH323 version you are using doesn't support Quicknet devices); + if test "x${konference_error}" == "xnone" ; then + konference_error="Sorry but the OpenH323 version you are using doesn't support Quicknet devices" + fi fi +if test "x${konference_error}" != "xnone" ; then + DO_NOT_COMPILE="konference $DO_NOT_COMPILE" +fi dnl #########################################################################