diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | config.h.in | 6 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | drivers.m4 | 19 | ||||
| -rw-r--r-- | drv.c | 4 |
6 files changed, 33 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 5b84356..81d07a9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -91,6 +91,7 @@ drv_Pertelian \ drv_picoLCD.c \ drv_RouterBoard.c \ drv_Sample.c \ +drv_st2205.c \ drv_serdisplib.c \ drv_SimpleLCD.c \ drv_T6963.c \ diff --git a/Makefile.in b/Makefile.in index 47b01d2..65a95f8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -286,6 +286,7 @@ drv_Pertelian \ drv_picoLCD.c \ drv_RouterBoard.c \ drv_Sample.c \ +drv_st2205.c \ drv_serdisplib.c \ drv_SimpleLCD.c \ drv_T6963.c \ @@ -478,6 +479,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_generic_text.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_picoLCD.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_serdisplib.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drv_st2205.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/evaluator.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hash.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/layout.Po@am__quote@ diff --git a/config.h.in b/config.h.in index 650b03e..dcb1e73 100644 --- a/config.h.in +++ b/config.h.in @@ -121,6 +121,9 @@ /* Define to 1 if you have the `sqrt' function. */ #undef HAVE_SQRT +/* Define to 1 if you have the <st2205.h> header file. */ +#undef HAVE_ST2205_H + /* Define to 1 if `stat' has the bug that it succeeds when given the zero-length file name argument. */ #undef HAVE_STAT_EMPTY_STRING_BUG @@ -488,6 +491,9 @@ /* SimpleLCD driver */ #undef WITH_SIMPLELCD +/* st2205 driver */ +#undef WITH_ST2205 + /* T6963 driver */ #undef WITH_T6963 diff --git a/configure.in b/configure.in index e3e79e9..78ff1e6 100644 --- a/configure.in +++ b/configure.in @@ -77,6 +77,9 @@ AC_CHECK_HEADERS(luise.h, [has_luise="true"], [has_luise="false"]) # check for serdisplib AC_CHECK_HEADERS(serdisplib/serdisp.h, [has_serdisplib="true"], [has_serdisplib="false"]) +# check for st2205 libs +AC_CHECK_HEADERS(st2205.h, [has_st2205="true"], [has_st2205="false"]) + # check for LCD-Linux AC_CHECK_HEADERS(linux/lcd-linux.h linux/hd44780.h, [has_lcd_linux="true"], [has_lcd_linux="false"; break]) @@ -36,8 +36,8 @@ AC_ARG_WITH( [ G15, HD44780, LCD2USB LCDLinux, LCDTerm, LPH7508,] [ LUIse, M50530, MatrixOrbital, MilfordInstruments,] [ Noritake, NULL, PNG, PPM, Pertelian, picoLCD, RouterBoard,] - [ Sample, serdisplib, SimpleLCD, T6963, Trefon, USBLCD,] - [ USBHUB, WincorNixdorf, X11], + [ Sample, serdisplib, SimpleLCD, st2205, T6963, Trefon,] + [ USBLCD, USBHUB, WincorNixdorf, X11], drivers=$withval, drivers=all ) @@ -83,6 +83,7 @@ for driver in $drivers; do PPM="yes" ROUTERBOARD="yes" SAMPLE="yes" + ST2205="yes" SERDISPLIB="yes" SIMPLELCD="yes" T6963="yes" @@ -176,6 +177,9 @@ for driver in $drivers; do SimpleLCD) SIMPLELCD=$val ;; + st2205) + ST2205=$val + ;; T6963) T6963=$val ;; @@ -480,6 +484,17 @@ if test "$SIMPLELCD" = "yes"; then AC_DEFINE(WITH_SIMPLELCD,1,[SimpleLCD driver]) fi +if test "$ST2205" = "yes"; then + if test "$has_st2205" = "true"; then + GRAPHIC="yes" + DRIVERS="$DRIVERS drv_st2205.o" + DRVLIBS="$DRVLIBS -L/usr/local/lib -lst2205" + AC_DEFINE(WITH_ST2205,1,[st2205 driver]) + else + AC_MSG_WARN(st2205.h not found: st2205 driver disabled) + fi +fi + if test "$T6963" = "yes"; then GRAPHIC="yes" PARPORT="yes" @@ -71,6 +71,7 @@ extern DRIVER drv_Pertelian; extern DRIVER drv_picoLCD; extern DRIVER drv_RouterBoard; extern DRIVER drv_Sample; +extern DRIVER drv_st2205; extern DRIVER drv_serdisplib; extern DRIVER drv_SimpleLCD; extern DRIVER drv_T6963; @@ -159,6 +160,9 @@ DRIVER *Driver[] = { #ifdef WITH_SAMPLE &drv_Sample, #endif +#ifdef WITH_ST2205 + &drv_st2205, +#endif #ifdef WITH_SERDISPLIB &drv_serdisplib, #endif |