diff options
| -rw-r--r-- | config.h.in | 3 | ||||
| -rwxr-xr-x | configure | 50 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | oskit/ds_osenv.c | 4 |
4 files changed, 57 insertions, 3 deletions
diff --git a/config.h.in b/config.h.in index 3c60e134..020168cd 100644 --- a/config.h.in +++ b/config.h.in @@ -10,3 +10,6 @@ /* Define if you have the <oskit/dev/stream.h> header file. */ #undef HAVE_OSKIT_DEV_STREAM_H + +/* Definf if -loskit_dev has the i8042 driver. */ +#undef HAVE_I8042 @@ -1298,10 +1298,54 @@ fi done +echo $ac_n "checking for oskit_dev_init_i8042 in -loskit_dev""... $ac_c" 1>&6 +echo "configure:1303: checking for oskit_dev_init_i8042 in -loskit_dev" >&5 +ac_lib_var=`echo oskit_dev'_'oskit_dev_init_i8042 | sed 'y%./+-%__p_%'` +if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + ac_save_LIBS="$LIBS" +LIBS="-loskit_dev -loskit_lmm -loskit_clientos -loskit_c -loskit_kern -loskit_com $LIBS" +cat > conftest.$ac_ext <<EOF +#line 1311 "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 + builtin and then its argument prototype would still apply. */ +char oskit_dev_init_i8042(); + +int main() { +oskit_dev_init_i8042() +; return 0; } +EOF +if { (eval echo configure:1322: \"$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 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_lib_$ac_lib_var=no" +fi +rm -f conftest* +LIBS="$ac_save_LIBS" + +fi +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF +#define HAVE_I8042 1 +EOF + +else + echo "$ac_t""no" 1>&6 +fi + + SMP_LIBS= if test $MAXCPUS -gt 1; then echo $ac_n "checking for smp_init in -loskit_smp""... $ac_c" 1>&6 -echo "configure:1305: checking for smp_init in -loskit_smp" >&5 +echo "configure:1349: checking for smp_init in -loskit_smp" >&5 ac_lib_var=`echo oskit_smp'_'smp_init | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1309,7 +1353,7 @@ else ac_save_LIBS="$LIBS" LIBS="-loskit_smp $LIBS" cat > conftest.$ac_ext <<EOF -#line 1313 "configure" +#line 1357 "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 @@ -1320,7 +1364,7 @@ int main() { smp_init() ; return 0; } EOF -if { (eval echo configure:1324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1368: \"$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 diff --git a/configure.in b/configure.in index 41e9280b..1f1e20e8 100644 --- a/configure.in +++ b/configure.in @@ -98,6 +98,9 @@ fi AC_CHECK_HEADERS(oskit/dev/stream.h) +AC_CHECK_LIB(oskit_dev, oskit_dev_init_i8042, [AC_DEFINE(HAVE_I8042)], [], + [-loskit_lmm -loskit_clientos -loskit_c -loskit_kern -loskit_com]) + AC_SUBST(SMP_LIBS)SMP_LIBS= if test $MAXCPUS -gt 1; then AC_CHECK_LIB(oskit_smp, smp_init, [SMP_LIBS=-loskit_smp], [ diff --git a/oskit/ds_osenv.c b/oskit/ds_osenv.c index 13591161..2721ff71 100644 --- a/oskit/ds_osenv.c +++ b/oskit/ds_osenv.c @@ -67,4 +67,8 @@ ds_osenv_init (void) oskit_linux_init_osenv (mach_osenv); oskit_linux_init_devs (); + +#ifdef HAVE_I8042 + oskit_dev_init_i8042 (); +#endif } |