configure

changeset 51
a03b6dac5398
parent 41
f534ace74eea
child 57
a76dc0db592c
--- a/configure	Sun May 25 16:39:54 2014 +0200
+++ b/configure	Sun May 25 22:06:56 2014 +0200
@@ -582,7 +582,7 @@
 PACKAGE_BUGREPORT=
 PACKAGE_URL=
 
-ac_unique_file="thermometers/main.c"
+ac_unique_file="thermometers/thermometers.c"
 ac_default_prefix=/usr/local
 # Factoring default headers for most tests.
 ac_includes_default="\
@@ -2028,11 +2028,11 @@
 
 ac_config_headers="$ac_config_headers config.h"
 
-SUBDIRS="lib dht11 rc433 thermferm thermometers"
+SUBDIRS="dht11 rc433 thermferm thermometers"
 
 
 PACKAGE="mbsePi-apps"
-VERSION="0.0.6"
+VERSION="0.0.7"
 COPYRIGHT="Copyright (C) 2014 Michiel Broek, All Rights Reserved"
 CYEARS="2014"
 
@@ -3091,57 +3091,6 @@
 fi
 
 if test "$result" = "yes"; then
-  LIBS="$LIBS -lmosquitto"
-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"
   ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3539,7 +3488,71 @@
 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
+
+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
 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 :

mercurial