diff -r 54f9b5d39e4c -r 3446371e0bdb configure --- a/configure Tue Jul 29 20:11:23 2014 +0200 +++ b/configure Tue Jul 29 20:42:02 2014 +0200 @@ -3047,14 +3047,15 @@ # # Libraries for mbsePi-apps # - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mosquitto_lib_init in -lmosquitto" >&5 -$as_echo_n "checking for mosquitto_lib_init in -lmosquitto... " >&6; } -if ${ac_cv_lib_mosquitto_mosquitto_lib_init+:} false; then : +WIRINGPI=No + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for wiringPiSetup in -lwiringPi" >&5 +$as_echo_n "checking for wiringPiSetup in -lwiringPi... " >&6; } +if ${ac_cv_lib_wiringPi_wiringPiSetup+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lmosquitto $LIBS" +LIBS="-lwiringPi $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -3064,33 +3065,34 @@ #ifdef __cplusplus extern "C" #endif -char mosquitto_lib_init (); +char wiringPiSetup (); int main () { -return mosquitto_lib_init (); +return wiringPiSetup (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_mosquitto_mosquitto_lib_init=yes + ac_cv_lib_wiringPi_wiringPiSetup=yes else - ac_cv_lib_mosquitto_mosquitto_lib_init=no + ac_cv_lib_wiringPi_wiringPiSetup=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mosquitto_mosquitto_lib_init" >&5 -$as_echo "$ac_cv_lib_mosquitto_mosquitto_lib_init" >&6; } -if test "x$ac_cv_lib_mosquitto_mosquitto_lib_init" = xyes; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wiringPi_wiringPiSetup" >&5 +$as_echo "$ac_cv_lib_wiringPi_wiringPiSetup" >&6; } +if test "x$ac_cv_lib_wiringPi_wiringPiSetup" = xyes; then : result=yes else result=no fi if test "$result" = "yes"; then + LIBS="$LIBS -lwiringPi -lwiringPiDev" ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -3488,70 +3490,7 @@ done -for ac_header in mosquitto.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "mosquitto.h" "ac_cv_header_mosquitto_h" "$ac_includes_default" -if test "x$ac_cv_header_mosquitto_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_MOSQUITTO_H 1 -_ACEOF - MOSQUITTO=Yes -else - MOSQUITTO=No -fi - -done - -else - as_fn_error $? "libmosquitto not found" "$LINENO" 5 -fi - -WIRINGPI=No -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for wiringPiSetup in -lwiringPi" >&5 -$as_echo_n "checking for wiringPiSetup in -lwiringPi... " >&6; } -if ${ac_cv_lib_wiringPi_wiringPiSetup+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lwiringPi $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char wiringPiSetup (); -int -main () -{ -return wiringPiSetup (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_wiringPi_wiringPiSetup=yes -else - ac_cv_lib_wiringPi_wiringPiSetup=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_wiringPi_wiringPiSetup" >&5 -$as_echo "$ac_cv_lib_wiringPi_wiringPiSetup" >&6; } -if test "x$ac_cv_lib_wiringPi_wiringPiSetup" = xyes; then : - result=yes -else - result=no -fi - -if test "$result" = "yes"; then - LIBS="$LIBS -lwiringPi -lwiringPiDev" - for ac_header in wiringPi.h +for ac_header in wiringPi.h do : ac_fn_c_check_header_mongrel "$LINENO" "wiringPi.h" "ac_cv_header_wiringPi_h" "$ac_includes_default" if test "x$ac_cv_header_wiringPi_h" = xyes; then : @@ -3567,68 +3506,6 @@ fi -OWSERVER=No -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OWNET_init in -lownet" >&5 -$as_echo_n "checking for OWNET_init in -lownet... " >&6; } -if ${ac_cv_lib_ownet_OWNET_init+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lownet $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char OWNET_init (); -int -main () -{ -return OWNET_init (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_ownet_OWNET_init=yes -else - ac_cv_lib_ownet_OWNET_init=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ownet_OWNET_init" >&5 -$as_echo "$ac_cv_lib_ownet_OWNET_init" >&6; } -if test "x$ac_cv_lib_ownet_OWNET_init" = xyes; then : - result=yes -else - result=no -fi - -if test "$result" = "yes"; then - LIBS="$LIBS -lownet" - for ac_header in ownetapi.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "ownetapi.h" "ac_cv_header_ownetapi_h" "$ac_includes_default" -if test "x$ac_cv_header_ownetapi_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_OWNETAPI_H 1 -_ACEOF - OWSERVER=Yes -else - OWSERVER=No -fi - -done - -fi - - # # Additional commandline switches # @@ -5180,7 +5057,6 @@ Version : ............ ${VERSION} Main directory : ..... ${prefix} WiringPi : ........... ${WIRINGPI} - OWserver : ........... ${OWSERVER} Now type 'make' and 'sudo make install' " >&5 @@ -5192,7 +5068,6 @@ Version : ............ ${VERSION} Main directory : ..... ${prefix} WiringPi : ........... ${WIRINGPI} - OWserver : ........... ${OWSERVER} Now type 'make' and 'sudo make install' " >&6; }