Mercurial > mbsePi-apps / file diff

--- a/configure	Mon Oct 05 15:21:46 2015 +0200
+++ b/configure	Sat Nov 07 22:04:17 2015 +0100
@@ -622,7 +622,8 @@
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
-CXXFLAGS
+SDL_LIBS
+SDL_CFLAGS
 EGREP
 GREP
 CPP
@@ -2030,11 +2031,11 @@
 
 ac_config_headers="$ac_config_headers config.h"
 
-SUBDIRS="dht11 rc433 thermferm"
+SUBDIRS="dht11 rc433 thermferm brewco brewpanel"
 
 
 PACKAGE="mbsePi-apps"
-VERSION="0.4.3"
+VERSION="0.5.0"
 COPYRIGHT="Copyright (C) 2014-2015 Michiel Broek, All Rights Reserved"
 CYEARS="2014-2015"
 
@@ -3674,6 +3675,63 @@
   as_fn_error $? "libuuid not found" "$LINENO" 5
 fi
 
+# Check for SDL
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking SDL library" >&5
+$as_echo_n "checking SDL library... " >&6; }
+pkg-config --exists sdl
+if test "$?" = "0"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  as_fn_error $? "no" "$LINENO" 5
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking sdl library v1.2.0 or newer" >&5
+$as_echo_n "checking sdl library v1.2.0 or newer... " >&6; }
+pkg-config --atleast-version=1.2.0 sdl
+if test "$?" = "0"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+$as_echo "found" >&6; }
+else
+  as_fn_error $? "not found" "$LINENO" 5
+fi
+SDL_CFLAGS="$(pkg-config --cflags sdl)"
+SDL_LIBS="$(pkg-config --libs sdl)"
+for ac_header in SDL/SDL.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "SDL/SDL.h" "ac_cv_header_SDL_SDL_h" "$ac_includes_default"
+if test "x$ac_cv_header_SDL_SDL_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SDL_SDL_H 1
+_ACEOF
+
+fi
+
+done
+
+
+# Check for SDL_ttf
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking SDL_ttf library" >&5
+$as_echo_n "checking SDL_ttf library... " >&6; }
+pkg-config --exists SDL_ttf
+if test "$?" = "0"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  as_fn_error $? "no" "$LINENO" 5
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking sdl library v2.0.0 or newer" >&5
+$as_echo_n "checking sdl library v2.0.0 or newer... " >&6; }
+pkg-config --atleast-version=2.0.0 SDL_ttf
+if test "$?" = "0"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+$as_echo "found" >&6; }
+else
+  as_fn_error $? "not found" "$LINENO" 5
+fi
+# Override flags
+SDL_CFLAGS="$(pkg-config --cflags SDL_ttf)"
+SDL_LIBS="$(pkg-config --libs SDL_ttf)"
+
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
@@ -3791,6 +3849,7 @@
 
 
 
+
 ac_config_files="$ac_config_files Makefile.global"
 
 cat >confcache <<\_ACEOF