From: Erik M. <er...@us...> - 2001-10-09 19:25:02
|
Update of /cvsroot/blob/blob In directory usw-pr-cvs1:/tmp/cvs-serv6782 Modified Files: configure.in Log Message: make it compile on all platforms with --enable-all-features enabled lcd_test() can be a static function Index: configure.in =================================================================== RCS file: /cvsroot/blob/blob/configure.in,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- configure.in 2001/10/09 17:49:36 1.16 +++ configure.in 2001/10/09 19:24:54 1.17 @@ -83,42 +83,49 @@ AC_DEFINE(ASSABET) AC_DEFINE(USE_SERIAL1) use_cpu="sa1110" + use_lcd="no" ;; brutus) AC_MSG_RESULT(Brutus) AC_DEFINE(BRUTUS) AC_DEFINE(USE_SERIAL3) use_cpu="sa1100" + use_lcd="no" ;; creditlart) AC_MSG_RESULT(CreditLART) AC_DEFINE(CLART) AC_DEFINE(USE_SERIAL3) use_cpu="sa1110" + use_lcd="no" ;; lart) AC_MSG_RESULT(LART) AC_DEFINE(LART) AC_DEFINE(USE_SERIAL3) use_cpu="sa1100" + use_lcd="no" ;; nesa) AC_MSG_RESULT(NESA) AC_DEFINE(NESA) AC_DEFINE(USE_SERIAL3) use_cpu="sa1100" + use_lcd="no" ;; pleb) AC_MSG_RESULT(PLEB) AC_DEFINE(PLEB) AC_DEFINE(USE_SERIAL3) use_cpu="sa1100" + use_lcd="no" ;; shannon) AC_MSG_RESULT(SHANNON) AC_DEFINE(SHANNON) AC_DEFINE(USE_SERIAL3) use_cpu="sa1100" + use_lcd="no" ;; system3) AC_MSG_RESULT(PTSystem3) @@ -126,12 +133,14 @@ AC_DEFINE(USE_SERIAL1) DIAG_PLATFORM_OBJ="system3.o" use_cpu="sa1110" + use_lcd="yes" ;; *) AC_MSG_RESULT(unknown) AC_MSG_WARN([Unknown board name, assuming SA1100 with serial 3]) AC_DEFINE(USE_SERIAL3) use_cpu="sa1100" + use_lcd="no" ;; esac @@ -188,12 +197,12 @@ [chkmem_flag=no]) AC_ARG_ENABLE(debug, -[ --enable-debug Enable support for misc debugging functions ], +[ --enable-debug Enable support for misc debugging functions ], [debug_flag=$enable_debug], [debug_flag=no]) AC_ARG_ENABLE(lcd, -[ --enable-lcd Enable lcd support ], +[ --enable-lcd Enable lcd support ], [lcd_flag=$enable_lcd], [lcd_flag=no]) @@ -245,8 +254,14 @@ dnl Check wether or not lcd support code is wanted if test "x$lcd_flag" = "xyes" ; then - LCD="lcd.o" - AC_DEFINE(CONFIG_LCD_SUPPORT) + if test "x$use_lcd" = "xyes" ; then + LCD="lcd.o" + AC_DEFINE(CONFIG_LCD_SUPPORT) + else + AC_MSG_WARN([No LCD suport for ${board_name}, disabling]) + LCD="" + lcd_flag="no" + fi fi AC_SUBST(LCD) |