diff options
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | Raster.c | 8 | ||||
| -rw-r--r-- | acconfig.h | 3 | ||||
| -rw-r--r-- | config.h.in | 3 | ||||
| -rwxr-xr-x | configure | 148 | ||||
| -rw-r--r-- | configure.in | 11 | ||||
| -rw-r--r-- | display.c | 11 |
7 files changed, 113 insertions, 73 deletions
diff --git a/Makefile.in b/Makefile.in index 177adda..9296c90 100644 --- a/Makefile.in +++ b/Makefile.in @@ -294,7 +294,7 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ - cp -pr $$/$$file $(distdir)/$$file; \ + cp -pr $$d/$$file $(distdir)/$$file; \ else \ test -f $(distdir)/$$file \ || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ @@ -1,4 +1,4 @@ -/* $Id: Raster.c,v 1.18 2001/03/16 16:40:17 ltoetsch Exp $ +/* $Id: Raster.c,v 1.19 2001/09/10 13:55:53 reinelt Exp $ * * driver for raster formats * @@ -20,6 +20,9 @@ * * * $Log: Raster.c,v $ + * Revision 1.19 2001/09/10 13:55:53 reinelt + * M50530 driver + * * Revision 1.18 2001/03/16 16:40:17 ltoetsch * implemented time bar * @@ -125,6 +128,9 @@ #include <gd.h> #else #error "gd.h not found!" +#error "cannot compile PNG driver" +#error "exclude the driver with" +#error "configure --drivers=all,\!PNG" #endif #endif #endif @@ -7,6 +7,9 @@ /* Define if you want the HD44780 driver compiled */ #undef WITH_HD44780 +/* Define if you want the M50530 driver compiled */ +#undef WITH_M50530 + /* Define if you want the Matrix Orbital driver compiled */ #undef WITH_MATRIXORBITAL diff --git a/config.h.in b/config.h.in index 3dcee7e..6d1e48e 100644 --- a/config.h.in +++ b/config.h.in @@ -45,6 +45,9 @@ /* Define if you want the HD44780 driver compiled */ #undef WITH_HD44780 +/* Define if you want the M50530 driver compiled */ +#undef WITH_M50530 + /* Define if you want the Matrix Orbital driver compiled */ #undef WITH_MATRIXORBITAL @@ -30,7 +30,7 @@ ac_help="$ac_help drivers may be excluded with 'all,!<driver>', (try 'all,\!<driver>' if your shell complains...) possible drivers are: - BeckmannEgle, CrystalFontz, HD44780, + BeckmannEgle, CrystalFontz, HD44780, M50530 MatrixOrbital, PalmPilot, PNG, PPM, X11, Text" # Initialize some variables set by options. @@ -2578,6 +2578,7 @@ for driver in $drivers; do BECKMANNEGLE="yes" CRYSTALFONTZ="yes" HD44780="yes" + M50530="yes" MATRIXORBITAL="yes" PALMPILOT="yes" PNG="yes" @@ -2593,6 +2594,9 @@ for driver in $drivers; do ;; HD44780) HD44780=$val + ;; + M50530) + M50530=$val ;; MatrixOrbital) MATRIXORBITAL=$val @@ -2652,6 +2656,14 @@ EOF fi +if test "$M50530" = "yes"; then + DRIVERS="$DRIVERS M50530.o" + cat >> confdefs.h <<\EOF +#define WITH_M50530 1 +EOF + +fi + if test "$MATRIXORBITAL" = "yes"; then DRIVERS="$DRIVERS MatrixOrbital.o" cat >> confdefs.h <<\EOF @@ -2741,12 +2753,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2745: checking for ANSI C header files" >&5 +echo "configure:2757: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2750 "configure" +#line 2762 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -2754,7 +2766,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2758: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2770: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2771,7 +2783,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 2775 "configure" +#line 2787 "configure" #include "confdefs.h" #include <string.h> EOF @@ -2789,7 +2801,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 2793 "configure" +#line 2805 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -2810,7 +2822,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 2814 "configure" +#line 2826 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2821,7 +2833,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:2825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2849,12 +2861,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:2853: checking for $ac_hdr that defines DIR" >&5 +echo "configure:2865: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2858 "configure" +#line 2870 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_hdr> @@ -2862,7 +2874,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:2866: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2878: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -2887,7 +2899,7 @@ done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:2891: checking for opendir in -ldir" >&5 +echo "configure:2903: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2895,7 +2907,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <<EOF -#line 2899 "configure" +#line 2911 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2906,7 +2918,7 @@ int main() { opendir() ; return 0; } EOF -if { (eval echo configure:2910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2928,7 +2940,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:2932: checking for opendir in -lx" >&5 +echo "configure:2944: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2936,7 +2948,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <<EOF -#line 2940 "configure" +#line 2952 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2947,7 +2959,7 @@ int main() { opendir() ; return 0; } EOF -if { (eval echo configure:2951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2970,12 +2982,12 @@ fi fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:2974: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:2986: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2979 "configure" +#line 2991 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/wait.h> @@ -2991,7 +3003,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:2995: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3007: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -3015,17 +3027,17 @@ for ac_hdr in fcntl.h limits.h strings.h sys/ioctl.h sys/time.h syslog.h unistd. do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3019: checking for $ac_hdr" >&5 +echo "configure:3031: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3024 "configure" +#line 3036 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3029: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3041: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3055,17 +3067,17 @@ for ac_hdr in sys/io.h asm/io.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3059: checking for $ac_hdr" >&5 +echo "configure:3071: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3064 "configure" +#line 3076 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3069: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3081: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3095,17 +3107,17 @@ for ac_hdr in linux/parport.h linux/ppdev.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3099: checking for $ac_hdr" >&5 +echo "configure:3111: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3104 "configure" +#line 3116 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3109: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3121: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3135,17 +3147,17 @@ for ac_hdr in gd/gd.h gd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3139: checking for $ac_hdr" >&5 +echo "configure:3151: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3144 "configure" +#line 3156 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3149: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3161: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3175,17 +3187,17 @@ for ac_hdr in net/if_ppp.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3179: checking for $ac_hdr" >&5 +echo "configure:3191: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3184 "configure" +#line 3196 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3189: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3201: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3215,17 +3227,17 @@ for ac_hdr in asm/msr.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3219: checking for $ac_hdr" >&5 +echo "configure:3231: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3224 "configure" +#line 3236 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3229: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3241: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3253,12 +3265,12 @@ done echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:3257: checking for working const" >&5 +echo "configure:3269: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3262 "configure" +#line 3274 "configure" #include "confdefs.h" int main() { @@ -3307,7 +3319,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:3311: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3323: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -3328,21 +3340,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:3332: checking for inline" >&5 +echo "configure:3344: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <<EOF -#line 3339 "configure" +#line 3351 "configure" #include "confdefs.h" int main() { } $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:3346: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3358: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -3368,12 +3380,12 @@ EOF esac echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:3372: checking for pid_t" >&5 +echo "configure:3384: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3377 "configure" +#line 3389 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -3401,12 +3413,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:3405: checking for size_t" >&5 +echo "configure:3417: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3410 "configure" +#line 3422 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -3434,12 +3446,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:3438: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:3450: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3443 "configure" +#line 3455 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -3448,7 +3460,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:3452: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -3469,12 +3481,12 @@ EOF fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:3473: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:3485: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3478 "configure" +#line 3490 "configure" #include "confdefs.h" #include <sys/types.h> #include <time.h> @@ -3482,7 +3494,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:3486: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3498: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -3503,12 +3515,12 @@ EOF fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:3507: checking for uid_t in sys/types.h" >&5 +echo "configure:3519: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3512 "configure" +#line 3524 "configure" #include "confdefs.h" #include <sys/types.h> EOF @@ -3539,13 +3551,13 @@ fi if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:3543: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:3555: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext <<EOF -#line 3549 "configure" +#line 3561 "configure" #include "confdefs.h" #include <sgtty.h> Autoconf TIOCGETP @@ -3563,7 +3575,7 @@ rm -f conftest* if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext <<EOF -#line 3567 "configure" +#line 3579 "configure" #include "confdefs.h" #include <termio.h> Autoconf TCGETA @@ -3585,7 +3597,7 @@ echo "$ac_t""$ac_cv_prog_gcc_traditional" 1>&6 fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:3589: checking for 8-bit clean memcmp" >&5 +echo "configure:3601: checking for 8-bit clean memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3593,7 +3605,7 @@ else ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <<EOF -#line 3597 "configure" +#line 3609 "configure" #include "confdefs.h" main() @@ -3603,7 +3615,7 @@ main() } EOF -if { (eval echo configure:3607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -3621,12 +3633,12 @@ echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6 test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:3625: checking return type of signal handlers" >&5 +echo "configure:3637: checking return type of signal handlers" >&5 if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3630 "configure" +#line 3642 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -3643,7 +3655,7 @@ int main() { int i; ; return 0; } EOF -if { (eval echo configure:3647: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3659: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -3664,12 +3676,12 @@ EOF for ac_func in gettimeofday putenv select socket strdup strerror strstr strtol uname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3668: checking for $ac_func" >&5 +echo "configure:3680: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3673 "configure" +#line 3685 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3692,7 +3704,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else diff --git a/configure.in b/configure.in index e8a080d..8f6cca0 100644 --- a/configure.in +++ b/configure.in @@ -29,7 +29,7 @@ AC_ARG_WITH( [ drivers may be excluded with 'all,!<driver>',] [ (try 'all,\!<driver>' if your shell complains...)] [ possible drivers are:] - [ BeckmannEgle, CrystalFontz, HD44780,] + [ BeckmannEgle, CrystalFontz, HD44780, M50530] [ MatrixOrbital, PalmPilot, PNG, PPM, X11, Text], drivers=$withval, drivers=all @@ -54,6 +54,7 @@ for driver in $drivers; do BECKMANNEGLE="yes" CRYSTALFONTZ="yes" HD44780="yes" + M50530="yes" MATRIXORBITAL="yes" PALMPILOT="yes" PNG="yes" @@ -69,6 +70,9 @@ for driver in $drivers; do ;; HD44780) HD44780=$val + ;; + M50530) + M50530=$val ;; MatrixOrbital) MATRIXORBITAL=$val @@ -119,6 +123,11 @@ if test "$HD44780" = "yes"; then AC_DEFINE(WITH_HD44780) fi +if test "$M50530" = "yes"; then + DRIVERS="$DRIVERS M50530.o" + AC_DEFINE(WITH_M50530) +fi + if test "$MATRIXORBITAL" = "yes"; then DRIVERS="$DRIVERS MatrixOrbital.o" AC_DEFINE(WITH_MATRIXORBITAL) @@ -1,4 +1,4 @@ -/* $Id: display.c,v 1.28 2001/03/16 16:40:17 ltoetsch Exp $ +/* $Id: display.c,v 1.29 2001/09/10 13:55:53 reinelt Exp $ * * framework for device drivers * @@ -20,6 +20,9 @@ * * * $Log: display.c,v $ + * Revision 1.29 2001/09/10 13:55:53 reinelt + * M50530 driver + * * Revision 1.28 2001/03/16 16:40:17 ltoetsch * implemented time bar * @@ -184,6 +187,7 @@ extern LCD BeckmannEgle[]; extern LCD Crystalfontz[]; extern LCD HD44780[]; +extern LCD M50530[]; extern LCD MatrixOrbital[]; extern LCD PalmPilot[]; extern LCD Raster[]; @@ -202,6 +206,9 @@ FAMILY Driver[] = { #ifdef WITH_HD44780 { "HD 44780 based", HD44780 }, #endif +#ifdef WITH_M50530 + { "M50530 based", M50530 }, +#endif #ifdef WITH_MATRIXORBITAL { "Matrix Orbital", MatrixOrbital }, #endif @@ -221,7 +228,7 @@ FAMILY Driver[] = { { "X Window System", XWindow }, #endif #ifdef WITH_TEXT - { "X Ncurses Text", Text }, + { "ncurses Text", Text }, #endif { NULL } }; |