Mercurial > mbsePi-apps / file diff

--- a/configure	Sat Mar 26 14:43:31 2016 +0100
+++ b/configure	Sat Apr 30 21:06:20 2016 +0200
@@ -2035,7 +2035,7 @@
 
 
 PACKAGE="mbsePi-apps"
-VERSION="0.5.3"
+VERSION="0.5.4"
 COPYRIGHT="Copyright (C) 2014-2016 Michiel Broek, All Rights Reserved"
 CYEARS="2014-2016"
 
@@ -3050,15 +3050,15 @@
 #
 # Libraries for mbsePi-apps
 #
-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 :
+MOSQUITTO=No
+
+{ $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 :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lwiringPi  $LIBS"
+LIBS="-lmosquitto  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -3068,34 +3068,33 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-char wiringPiSetup ();
+char mosquitto_lib_init ();
 int
 main ()
 {
-return wiringPiSetup ();
+return mosquitto_lib_init ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_wiringPi_wiringPiSetup=yes
+  ac_cv_lib_mosquitto_mosquitto_lib_init=yes
 else
-  ac_cv_lib_wiringPi_wiringPiSetup=no
+  ac_cv_lib_mosquitto_mosquitto_lib_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_wiringPi_wiringPiSetup" >&5
-$as_echo "$ac_cv_lib_wiringPi_wiringPiSetup" >&6; }
-if test "x$ac_cv_lib_wiringPi_wiringPiSetup" = xyes; then :
+{ $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 :
   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'
@@ -3493,7 +3492,69 @@
 done
 
 
-for ac_header in wiringPi.h
+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
+
+  LIBS="$LIBS -lmosquitto"
+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
 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 :
@@ -5138,6 +5199,7 @@
     Version : ............ ${VERSION}
     Main directory : ..... ${prefix}
     WiringPi : ........... ${WIRINGPI}
+    MQTT : ............... ${MOSQUITTO}
     SDL library : ........ ${SDL}
     Simulator : .......... ${SIMULATOR}
 
@@ -5151,6 +5213,7 @@
     Version : ............ ${VERSION}
     Main directory : ..... ${prefix}
     WiringPi : ........... ${WIRINGPI}
+    MQTT : ............... ${MOSQUITTO}
     SDL library : ........ ${SDL}
     Simulator : .......... ${SIMULATOR}