diff options
Diffstat (limited to 'devel/SDL/patches/patch-am')
| -rw-r--r-- | devel/SDL/patches/patch-am | 1062 |
1 files changed, 758 insertions, 304 deletions
diff --git a/devel/SDL/patches/patch-am b/devel/SDL/patches/patch-am index 859445d1559..ce4d070b8ff 100644 --- a/devel/SDL/patches/patch-am +++ b/devel/SDL/patches/patch-am @@ -1,9 +1,31 @@ -$NetBSD: patch-am,v 1.12 2003/09/04 09:57:43 wiz Exp $ +$NetBSD: patch-am,v 1.13 2004/04/17 00:15:21 snj Exp $ ---- configure.orig Sat Aug 30 21:13:23 2003 -+++ configure -@@ -3132,6 +3132,8 @@ rm -f conftest* - echo "$ac_t""$have_oss" 1>&6 +--- configure.orig 2004-02-22 13:32:33.000000000 -0800 ++++ configure 2004-04-10 16:06:11.000000000 -0700 +@@ -463,7 +463,7 @@ ac_includes_default="\ + # include <unistd.h> + #endif" + +-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS SDL_MAJOR_VERSION SDL_MINOR_VERSION SDL_MICRO_VERSION SDL_INTERFACE_AGE SDL_BINARY_AGE SDL_VERSION LT_RELEASE LT_CURRENT LT_REVISION LT_AGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ALLOCA ASFLAGS CCAS CCASFLAGS am__fastdepOBJC_TRUE am__fastdepOBJC_FALSE ESD_CONFIG ESD_CFLAGS ESD_LIBS esd_lib ARTSCCONFIG arts_lib NASM NASMFLAGS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PKG_CONFIG DIRECTFB_CFLAGS DIRECTFB_LIBS PTH_CONFIG ARCH TARGET_LINUX_TRUE TARGET_LINUX_FALSE TARGET_QTOPIA_TRUE TARGET_QTOPIA_FALSE TARGET_SOLARIS_TRUE TARGET_SOLARIS_FALSE TARGET_IRIX_TRUE TARGET_IRIX_FALSE TARGET_BSDI_TRUE TARGET_BSDI_FALSE TARGET_FREEBSD_TRUE TARGET_FREEBSD_FALSE TARGET_NETBSD_TRUE TARGET_NETBSD_FALSE TARGET_OPENBSD_TRUE TARGET_OPENBSD_FALSE TARGET_AIX_TRUE TARGET_AIX_FALSE TARGET_WIN32_TRUE TARGET_WIN32_FALSE TARGET_BEOS_TRUE TARGET_BEOS_FALSE TARGET_MACOS_TRUE TARGET_MACOS_FALSE TARGET_MACOSX_TRUE TARGET_MACOSX_FALSE TARGET_QNX_TRUE TARGET_QNX_FALSE TARGET_MINT_TRUE TARGET_MINT_FALSE USE_DIRECTX_TRUE USE_DIRECTX_FALSE USE_CLONE_TRUE USE_CLONE_FALSE HAVE_NASM_TRUE HAVE_NASM_FALSE ENABLE_SHARED_TRUE ENABLE_SHARED_FALSE ENABLE_STATIC_TRUE ENABLE_STATIC_FALSE AUDIO_SUBDIRS AUDIO_DRIVERS VIDEO_SUBDIRS VIDEO_DRIVERS JOYSTICK_SUBDIRS JOYSTICK_DRIVERS CDROM_SUBDIRS CDROM_DRIVERS SDL_EXTRADIRS SDL_EXTRALIBS SDL_CFLAGS SDL_LIBS SDL_STATIC_LIBS SDL_RLD_FLAGS STATIC_SYSTEM_LIBS SHARED_SYSTEM_LIBS SYSTEM_LIBS OBJC OBJCFLAGS OBJCDEPMODE LIBOBJS LTLIBOBJS' ++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS SDL_MAJOR_VERSION SDL_MINOR_VERSION SDL_MICRO_VERSION SDL_INTERFACE_AGE SDL_BINARY_AGE SDL_VERSION LT_RELEASE LT_CURRENT LT_REVISION LT_AGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ALLOCA ASFLAGS CCAS CCASFLAGS am__fastdepOBJC_TRUE am__fastdepOBJC_FALSE ESD_CONFIG ESD_CFLAGS ESD_LIBS esd_lib ARTSCCONFIG arts_lib NASM NASMFLAGS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS PKG_CONFIG DIRECTFB_CFLAGS DIRECTFB_LIBS AALIB_CONFIG PTHREAD_CONFIG ARCH TARGET_LINUX_TRUE TARGET_LINUX_FALSE TARGET_QTOPIA_TRUE TARGET_QTOPIA_FALSE TARGET_SOLARIS_TRUE TARGET_SOLARIS_FALSE TARGET_IRIX_TRUE TARGET_IRIX_FALSE TARGET_BSDI_TRUE TARGET_BSDI_FALSE TARGET_FREEBSD_TRUE TARGET_FREEBSD_FALSE TARGET_NETBSD_TRUE TARGET_NETBSD_FALSE TARGET_OPENBSD_TRUE TARGET_OPENBSD_FALSE TARGET_AIX_TRUE TARGET_AIX_FALSE TARGET_WIN32_TRUE TARGET_WIN32_FALSE TARGET_BEOS_TRUE TARGET_BEOS_FALSE TARGET_MACOS_TRUE TARGET_MACOS_FALSE TARGET_MACOSX_TRUE TARGET_MACOSX_FALSE TARGET_QNX_TRUE TARGET_QNX_FALSE TARGET_MINT_TRUE TARGET_MINT_FALSE USE_DIRECTX_TRUE USE_DIRECTX_FALSE USE_CLONE_TRUE USE_CLONE_FALSE HAVE_NASM_TRUE HAVE_NASM_FALSE ENABLE_SHARED_TRUE ENABLE_SHARED_FALSE ENABLE_STATIC_TRUE ENABLE_STATIC_FALSE AUDIO_SUBDIRS AUDIO_DRIVERS VIDEO_SUBDIRS VIDEO_DRIVERS JOYSTICK_SUBDIRS JOYSTICK_DRIVERS CDROM_SUBDIRS CDROM_DRIVERS SDL_EXTRADIRS SDL_EXTRALIBS SDL_CFLAGS SDL_LIBS SDL_STATIC_LIBS SDL_RLD_FLAGS STATIC_SYSTEM_LIBS SHARED_SYSTEM_LIBS SYSTEM_LIBS OBJC OBJCFLAGS OBJCDEPMODE LIBOBJS LTLIBOBJS' + ac_subst_files='' + + # Initialize some variables set by options. +@@ -1587,9 +1587,9 @@ SDL_VERSION=$SDL_MAJOR_VERSION.$SDL_MINO + + # libtool versioning + LT_RELEASE=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION +-LT_CURRENT=`expr $SDL_MICRO_VERSION - $SDL_INTERFACE_AGE` +-LT_REVISION=$SDL_INTERFACE_AGE +-LT_AGE=`expr $SDL_BINARY_AGE - $SDL_INTERFACE_AGE` ++LT_CURRENT=$SDL_INTERFACE_AGE ++LT_REVISION=$SDL_BINARY_AGE ++LT_AGE=0 + + + +@@ -21563,6 +21563,8 @@ rm -f conftest.err conftest.$ac_objext c + echo "${ECHO_T}$have_oss" >&6 if test x$have_oss = xyes; then CFLAGS="$CFLAGS -DOSS_SUPPORT" + LDFLAGS="$LDFLAGS $LIBOSSAUDIO" @@ -11,19 +33,19 @@ $NetBSD: patch-am,v 1.12 2003/09/04 09:57:43 wiz Exp $ AUDIO_SUBDIRS="$AUDIO_SUBDIRS dsp" AUDIO_DRIVERS="$AUDIO_DRIVERS dsp/libaudio_dsp.la" AUDIO_SUBDIRS="$AUDIO_SUBDIRS dma" -@@ -3667,9 +3669,9 @@ fi - - if test x$enable_audio = xyes -a x$enable_nas = xyes; then - echo $ac_n "checking for NAS audio support""... $ac_c" 1>&6 --echo "configure:3671: checking for NAS audio support" >&5 -+echo "configure:3673: checking for NAS audio support" >&5 +@@ -22262,9 +22264,9 @@ fi; + echo "$as_me:$LINENO: checking for NAS audio support" >&5 + echo $ECHO_N "checking for NAS audio support... $ECHO_C" >&6 have_nas=no - if test -r /usr/X11R6/include/audio/audiolib.h; then + if true; then have_nas=yes - CFLAGS="$CFLAGS -DNAS_SUPPORT" +- CFLAGS="$CFLAGS -DNAS_SUPPORT -I/usr/X11R6/include/" ++ CFLAGS="$CFLAGS -DNAS_SUPPORT" SYSTEM_LIBS="$SYSTEM_LIBS -laudio -lXt" -@@ -3826,7 +3828,7 @@ fi + AUDIO_SUBDIRS="$AUDIO_SUBDIRS nas" + AUDIO_DRIVERS="$AUDIO_DRIVERS nas/libaudio_nas.la" +@@ -22530,7 +22532,7 @@ fi NASMFLAGS="-f aoutb" ;; *) @@ -31,77 +53,108 @@ $NetBSD: patch-am,v 1.12 2003/09/04 09:57:43 wiz Exp $ + test -n "$NASMFLAGS" || NASMFLAGS="-f elf" ;; esac - -@@ -5429,34 +5431,53 @@ else - fi +@@ -25053,63 +25055,58 @@ else + enable_video_aalib=no + fi; if test x$enable_video = xyes -a x$enable_video_aalib = xyes; then -- echo $ac_n "checking for AAlib support""... $ac_c" 1>&6 --echo "configure:5434: checking for AAlib support" >&5 +- echo "$as_me:$LINENO: checking for AAlib support" >&5 +-echo $ECHO_N "checking for AAlib support... $ECHO_C" >&6 - video_aalib=no -- cat > conftest.$ac_ext <<EOF --#line 5437 "configure" --#include "confdefs.h" +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ - - #include <aalib.h> -- --int main() { - -- --; return 0; } --EOF --if { (eval echo configure:5447: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -- rm -rf conftest* -- -- video_aalib=yes -- +-int +-main () +-{ +- +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then + # Extract the first word of "aalib-config", so it can be a program name with args. +set dummy aalib-config; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:5438: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_path_AALIB_CONFIG'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -+ case "$AALIB_CONFIG" in -+ /*) ++echo "$as_me:$LINENO: checking for $ac_word" >&5 ++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 ++if test "${ac_cv_path_AALIB_CONFIG+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ case $AALIB_CONFIG in ++ [\\/]* | ?:[\\/]*) + ac_cv_path_AALIB_CONFIG="$AALIB_CONFIG" # Let the user override the test with a path. + ;; -+ ?:/*) -+ ac_cv_path_AALIB_CONFIG="$AALIB_CONFIG" # Let the user override the test with a dos path. -+ ;; + *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_path_AALIB_CONFIG="$ac_dir/$ac_word" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" ++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ++ ac_cv_path_AALIB_CONFIG="$as_dir/$ac_word$ac_exec_ext" ++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 ++ break 2 ++ fi ++done ++done + +- video_aalib=yes + ;; +esac - fi --rm -f conftest* -+AALIB_CONFIG="$ac_cv_path_AALIB_CONFIG" -+if test -n "$AALIB_CONFIG"; then -+ echo "$ac_t""$AALIB_CONFIG" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 +fi ++AALIB_CONFIG=$ac_cv_path_AALIB_CONFIG + ++if test -n "$AALIB_CONFIG"; then ++ echo "$as_me:$LINENO: result: $AALIB_CONFIG" >&5 ++echo "${ECHO_T}$AALIB_CONFIG" >&6 + else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- ++ echo "$as_me:$LINENO: result: no" >&5 ++echo "${ECHO_T}no" >&6 + fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + -+ echo $ac_n "checking for AAlib support""... $ac_c" 1>&6 -+echo "configure:5471: checking for AAlib support" >&5 ++ echo "$as_me:$LINENO: checking for AAlib support" >&5 ++echo $ECHO_N "checking for AAlib support... $ECHO_C" >&6 + if test x$AALIB_CONFIG = x; then + video_aalib=no + else + AALIB_LIBS=`$AALIB_CONFIG --libs` + video_aalib=yes + fi - echo "$ac_t""$video_aalib" 1>&6 + echo "$as_me:$LINENO: result: $video_aalib" >&5 + echo "${ECHO_T}$video_aalib" >&6 if test x$video_aalib = xyes; then CFLAGS="$CFLAGS -DENABLE_AALIB" - SYSTEM_LIBS="$SYSTEM_LIBS -laa" @@ -109,57 +162,58 @@ $NetBSD: patch-am,v 1.12 2003/09/04 09:57:43 wiz Exp $ VIDEO_SUBDIRS="$VIDEO_SUBDIRS aalib" VIDEO_DRIVERS="$VIDEO_DRIVERS aalib/libvideo_aa.la" -@@ -5881,19 +5902,20 @@ else - fi - +@@ -25837,16 +25834,17 @@ else + enable_pth=yes + fi; if test x$enable_threads = xyes -a x$enable_pth = xyes; then - # Extract the first word of "pth-config", so it can be a program name with args. -set dummy pth-config; ac_word=$2 + # Use the libpthread version of the pth library. + # Extract the first word of "pthread-config", so it can be a program name with args. +set dummy pthread-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:5888: checking for $ac_word" >&5 --if eval "test \"`echo '$''{'ac_cv_path_PTH_CONFIG'+set}'`\" = set"; then -+echo "configure:5910: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_path_PTHREAD_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +-if test "${ac_cv_path_PTH_CONFIG+set}" = set; then ++if test "${ac_cv_path_PTHREAD_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else -- case "$PTH_CONFIG" in -+ case "$PTHREAD_CONFIG" in - /*) +- case $PTH_CONFIG in ++ case $PTHREAD_CONFIG in + [\\/]* | ?:[\\/]*) - ac_cv_path_PTH_CONFIG="$PTH_CONFIG" # Let the user override the test with a path. + ac_cv_path_PTHREAD_CONFIG="$PTHREAD_CONFIG" # Let the user override the test with a path. ;; - ?:/*) -- ac_cv_path_PTH_CONFIG="$PTH_CONFIG" # Let the user override the test with a dos path. -+ ac_cv_path_PTHREAD_CONFIG="$PTHREAD_CONFIG" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -@@ -5901,27 +5923,27 @@ else - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then -- ac_cv_path_PTH_CONFIG="$ac_dir/$ac_word" -+ ac_cv_path_PTHREAD_CONFIG="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +@@ -25856,32 +25854,32 @@ do + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then +- ac_cv_path_PTH_CONFIG="$as_dir/$ac_word$ac_exec_ext" ++ ac_cv_path_PTHREAD_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi + done + done + - test -z "$ac_cv_path_PTH_CONFIG" && ac_cv_path_PTH_CONFIG="no" + test -z "$ac_cv_path_PTHREAD_CONFIG" && ac_cv_path_PTHREAD_CONFIG="no" ;; esac fi --PTH_CONFIG="$ac_cv_path_PTH_CONFIG" +-PTH_CONFIG=$ac_cv_path_PTH_CONFIG ++PTHREAD_CONFIG=$ac_cv_path_PTHREAD_CONFIG + -if test -n "$PTH_CONFIG"; then -- echo "$ac_t""$PTH_CONFIG" 1>&6 -+PTHREAD_CONFIG="$ac_cv_path_PTHREAD_CONFIG" +- echo "$as_me:$LINENO: result: $PTH_CONFIG" >&5 +-echo "${ECHO_T}$PTH_CONFIG" >&6 +if test -n "$PTHREAD_CONFIG"; then -+ echo "$ac_t""$PTHREAD_CONFIG" 1>&6 ++ echo "$as_me:$LINENO: result: $PTHREAD_CONFIG" >&5 ++echo "${ECHO_T}$PTHREAD_CONFIG" >&6 else - echo "$ac_t""no" 1>&6 + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 fi - if test "$PTH_CONFIG" = "no"; then @@ -173,7 +227,7 @@ $NetBSD: patch-am,v 1.12 2003/09/04 09:57:43 wiz Exp $ SDL_CFLAGS="$SDL_CFLAGS $PTH_CFLAGS" SDL_LIBS="$SDL_LIBS $PTH_LIBS" CFLAGS="$CFLAGS -DENABLE_PTH" -@@ -5970,8 +5992,8 @@ fi +@@ -25930,8 +25928,8 @@ fi; pthread_lib="-pthread" ;; *-*-netbsd*) @@ -184,115 +238,331 @@ $NetBSD: patch-am,v 1.12 2003/09/04 09:57:43 wiz Exp $ ;; *-*-openbsd*) pthread_cflags="-D_REENTRANT" -@@ -7045,56 +7067,45 @@ else - echo "$ac_t""no" 1>&6 +@@ -27751,93 +27749,21 @@ if test $ac_cv_lib_usbhid_hid_init = yes + have_libusbhid=yes fi -- echo $ac_n "checking for hid_init in -lusb""... $ac_c" 1>&6 --echo "configure:7050: checking for hid_init in -lusb" >&5 --ac_lib_var=`echo usb'_'hid_init | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ if test x$have_libusbhid = xyes; then -+ SYSTEM_LIBS="$SYSTEM_LIBS -lusbhid" -+ -+ ac_safe=`echo "usbhid.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for usbhid.h""... $ac_c" 1>&6 -+echo "configure:7076: checking for usbhid.h" >&5 -+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -- ac_save_LIBS="$LIBS" +- echo "$as_me:$LINENO: checking for hid_init in -lusb" >&5 +-echo $ECHO_N "checking for hid_init in -lusb... $ECHO_C" >&6 +-if test "${ac_cv_lib_usb_hid_init+set}" = set; then +- echo $ECHO_N "(cached) $ECHO_C" >&6 +-else +- ac_check_lib_save_LIBS=$LIBS -LIBS="-lusb $LIBS" --cat > conftest.$ac_ext <<EOF --#line 7058 "configure" -+ cat > conftest.$ac_ext <<EOF -+#line 7081 "configure" - #include "confdefs.h" +-cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- -/* Override any gcc2 internal prototype to avoid an error. */ +-#ifdef __cplusplus +-extern "C" +-#endif -/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char hid_init(); +- builtin and then its argument prototype would still apply. */ +-char hid_init (); +-int +-main () +-{ +-hid_init (); +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext conftest$ac_exeext +-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +- (eval $ac_link) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest$ac_exeext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- ac_cv_lib_usb_hid_init=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 - --int main() { --hid_init() --; return 0; } +-ac_cv_lib_usb_hid_init=no +-fi +-rm -f conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-echo "$as_me:$LINENO: result: $ac_cv_lib_usb_hid_init" >&5 +-echo "${ECHO_T}$ac_cv_lib_usb_hid_init" >&6 +-if test $ac_cv_lib_usb_hid_init = yes; then +- have_libusb=yes +-fi +- + if test x$have_libusbhid = xyes; then + SYSTEM_LIBS="$SYSTEM_LIBS -lusbhid" +- fi +- if test x$have_libusb = xyes; then +- SYSTEM_LIBS="$SYSTEM_LIBS -lusb" +- fi + +- if test "${ac_cv_header_usb_h+set}" = set; then +- echo "$as_me:$LINENO: checking for usb.h" >&5 +-echo $ECHO_N "checking for usb.h... $ECHO_C" >&6 +-if test "${ac_cv_header_usb_h+set}" = set; then ++ if test "${ac_cv_header_usbhid_h+set}" = set; then ++ echo "$as_me:$LINENO: checking for usbhid.h" >&5 ++echo $ECHO_N "checking for usbhid.h... $ECHO_C" >&6 ++if test "${ac_cv_header_usbhid_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_usb_h" >&5 +-echo "${ECHO_T}$ac_cv_header_usb_h" >&6 ++echo "$as_me:$LINENO: result: $ac_cv_header_usbhid_h" >&5 ++echo "${ECHO_T}$ac_cv_header_usbhid_h" >&6 + else + # Is the header compilable? +-echo "$as_me:$LINENO: checking usb.h usability" >&5 +-echo $ECHO_N "checking usb.h usability... $ECHO_C" >&6 ++echo "$as_me:$LINENO: checking usbhid.h usability" >&5 ++echo $ECHO_N "checking usbhid.h usability... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -27845,7 +27771,7 @@ cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default +-#include <usb.h> ++#include <usbhid.h> + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +@@ -27881,15 +27807,15 @@ echo "$as_me:$LINENO: result: $ac_header + echo "${ECHO_T}$ac_header_compiler" >&6 + + # Is the header present? +-echo "$as_me:$LINENO: checking usb.h presence" >&5 +-echo $ECHO_N "checking usb.h presence... $ECHO_C" >&6 ++echo "$as_me:$LINENO: checking usbhid.h presence" >&5 ++echo $ECHO_N "checking usbhid.h presence... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <usb.h> +#include <usbhid.h> - EOF --if { (eval echo configure:7069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:7086: \"$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* -- eval "ac_cv_lib_$ac_lib_var=yes" -+ eval "ac_cv_header_$ac_safe=yes" + _ACEOF + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +@@ -27923,25 +27849,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6 + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) +- { echo "$as_me:$LINENO: WARNING: usb.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-echo "$as_me: WARNING: usb.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: usb.h: proceeding with the compiler's result" >&5 +-echo "$as_me: WARNING: usb.h: proceeding with the compiler's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: usbhid.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: usbhid.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: usbhid.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: usbhid.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) +- { echo "$as_me:$LINENO: WARNING: usb.h: present but cannot be compiled" >&5 +-echo "$as_me: WARNING: usb.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: usb.h: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: usb.h: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: usb.h: see the Autoconf documentation" >&5 +-echo "$as_me: WARNING: usb.h: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: usb.h: section \"Present But Cannot Be Compiled\"" >&5 +-echo "$as_me: WARNING: usb.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: usb.h: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: usb.h: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: usb.h: in the future, the compiler will take precedence" >&5 +-echo "$as_me: WARNING: usb.h: in the future, the compiler will take precedence" >&2;} ++ { echo "$as_me:$LINENO: WARNING: usbhid.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: usbhid.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: usbhid.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: usbhid.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: usbhid.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: usbhid.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: usbhid.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: usbhid.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: usbhid.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: usbhid.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: usbhid.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: usbhid.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX + ## ------------------------------------------ ## +@@ -27952,34 +27878,34 @@ _ASBOX + sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-echo "$as_me:$LINENO: checking for usb.h" >&5 +-echo $ECHO_N "checking for usb.h... $ECHO_C" >&6 +-if test "${ac_cv_header_usb_h+set}" = set; then ++echo "$as_me:$LINENO: checking for usbhid.h" >&5 ++echo $ECHO_N "checking for usbhid.h... $ECHO_C" >&6 ++if test "${ac_cv_header_usbhid_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else -+ echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" -+ eval "ac_cv_header_$ac_safe=no" +- ac_cv_header_usb_h=$ac_header_preproc ++ ac_cv_header_usbhid_h=$ac_header_preproc fi - rm -f conftest* --LIBS="$ac_save_LIBS" -- +-echo "$as_me:$LINENO: result: $ac_cv_header_usb_h" >&5 +-echo "${ECHO_T}$ac_cv_header_usb_h" >&6 ++echo "$as_me:$LINENO: result: $ac_cv_header_usbhid_h" >&5 ++echo "${ECHO_T}$ac_cv_header_usbhid_h" >&6 + fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- have_libusb=yes +-if test $ac_cv_header_usb_h = yes; then +- have_usb_h=yes ++if test $ac_cv_header_usbhid_h = yes; then + have_usbhid_h=yes - else - echo "$ac_t""no" 1>&6 fi -- if test x$have_libusbhid = xyes; then -- SYSTEM_LIBS="$SYSTEM_LIBS -lusbhid" -- fi -- if test x$have_libusb = xyes; then -- SYSTEM_LIBS="$SYSTEM_LIBS -lusb" -- fi -- -- ac_safe=`echo "usb.h" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for usb.h""... $ac_c" 1>&6 --echo "configure:7098: checking for usb.h" >&5 -+ ac_safe=`echo "libusbhid.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for libusbhid.h""... $ac_c" 1>&6 -+echo "configure:7109: checking for libusbhid.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -7099,12 +7110,12 @@ if eval "test \"`echo '$''{'ac_cv_header - echo $ac_n "(cached) $ac_c" 1>&6 + +- if test "${ac_cv_header_usbhid_h+set}" = set; then +- echo "$as_me:$LINENO: checking for usbhid.h" >&5 +-echo $ECHO_N "checking for usbhid.h... $ECHO_C" >&6 +-if test "${ac_cv_header_usbhid_h+set}" = set; then ++ if test "${ac_cv_header_libusbhid_h+set}" = set; then ++ echo "$as_me:$LINENO: checking for libusbhid.h" >&5 ++echo $ECHO_N "checking for libusbhid.h... $ECHO_C" >&6 ++if test "${ac_cv_header_libusbhid_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_usbhid_h" >&5 +-echo "${ECHO_T}$ac_cv_header_usbhid_h" >&6 ++echo "$as_me:$LINENO: result: $ac_cv_header_libusbhid_h" >&5 ++echo "${ECHO_T}$ac_cv_header_libusbhid_h" >&6 else - cat > conftest.$ac_ext <<EOF --#line 7103 "configure" -+#line 7114 "configure" - #include "confdefs.h" --#include <usb.h> + # Is the header compilable? +-echo "$as_me:$LINENO: checking usbhid.h usability" >&5 +-echo $ECHO_N "checking usbhid.h usability... $ECHO_C" >&6 ++echo "$as_me:$LINENO: checking libusbhid.h usability" >&5 ++echo $ECHO_N "checking libusbhid.h usability... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -27987,7 +27913,7 @@ cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default +-#include <usbhid.h> ++#include <libusbhid.h> + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +@@ -28023,15 +27949,15 @@ echo "$as_me:$LINENO: result: $ac_header + echo "${ECHO_T}$ac_header_compiler" >&6 + + # Is the header present? +-echo "$as_me:$LINENO: checking usbhid.h presence" >&5 +-echo $ECHO_N "checking usbhid.h presence... $ECHO_C" >&6 ++echo "$as_me:$LINENO: checking libusbhid.h presence" >&5 ++echo $ECHO_N "checking libusbhid.h presence... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <usbhid.h> +#include <libusbhid.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:7108: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:7119: \"$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* -@@ -7120,47 +7131,64 @@ rm -f conftest* + _ACEOF + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +@@ -28065,25 +27991,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6 + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) +- { echo "$as_me:$LINENO: WARNING: usbhid.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-echo "$as_me: WARNING: usbhid.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: usbhid.h: proceeding with the compiler's result" >&5 +-echo "$as_me: WARNING: usbhid.h: proceeding with the compiler's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libusbhid.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: libusbhid.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libusbhid.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: libusbhid.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) +- { echo "$as_me:$LINENO: WARNING: usbhid.h: present but cannot be compiled" >&5 +-echo "$as_me: WARNING: usbhid.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: usbhid.h: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: usbhid.h: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: usbhid.h: see the Autoconf documentation" >&5 +-echo "$as_me: WARNING: usbhid.h: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: usbhid.h: section \"Present But Cannot Be Compiled\"" >&5 +-echo "$as_me: WARNING: usbhid.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: usbhid.h: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: usbhid.h: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: usbhid.h: in the future, the compiler will take precedence" >&5 +-echo "$as_me: WARNING: usbhid.h: in the future, the compiler will take precedence" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libusbhid.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: libusbhid.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libusbhid.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: libusbhid.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libusbhid.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: libusbhid.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libusbhid.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: libusbhid.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libusbhid.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: libusbhid.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libusbhid.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: libusbhid.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX + ## ------------------------------------------ ## +@@ -28094,34 +28020,112 @@ _ASBOX + sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-echo "$as_me:$LINENO: checking for usbhid.h" >&5 +-echo $ECHO_N "checking for usbhid.h... $ECHO_C" >&6 +-if test "${ac_cv_header_usbhid_h+set}" = set; then ++echo "$as_me:$LINENO: checking for libusbhid.h" >&5 ++echo $ECHO_N "checking for libusbhid.h... $ECHO_C" >&6 ++if test "${ac_cv_header_libusbhid_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_cv_header_usbhid_h=$ac_header_preproc ++ ac_cv_header_libusbhid_h=$ac_header_preproc fi - if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- have_usb_h=yes +-echo "$as_me:$LINENO: result: $ac_cv_header_usbhid_h" >&5 +-echo "${ECHO_T}$ac_cv_header_usbhid_h" >&6 ++echo "$as_me:$LINENO: result: $ac_cv_header_libusbhid_h" >&5 ++echo "${ECHO_T}$ac_cv_header_libusbhid_h" >&6 + + fi +-if test $ac_cv_header_usbhid_h = yes; then +- have_usbhid_h=yes ++if test $ac_cv_header_libusbhid_h = yes; then + have_libusbhid_h=yes - else - echo "$ac_t""no" 1>&6 fi -- ac_safe=`echo "usbhid.h" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for usbhid.h""... $ac_c" 1>&6 --echo "configure:7131: checking for usbhid.h" >&5 --if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + +- if test "${ac_cv_header_libusb_h+set}" = set; then +- echo "$as_me:$LINENO: checking for libusb.h" >&5 +-echo $ECHO_N "checking for libusb.h... $ECHO_C" >&6 +-if test "${ac_cv_header_libusb_h+set}" = set; then + if test x$have_usbhid_h = xyes; then + CFLAGS="$CFLAGS -DHAVE_USBHID_H" + fi @@ -300,131 +570,315 @@ $NetBSD: patch-am,v 1.12 2003/09/04 09:57:43 wiz Exp $ + CFLAGS="$CFLAGS -DHAVE_LIBUSBHID_H" + fi + else -+ echo $ac_n "checking for hid_init in -lusb""... $ac_c" 1>&6 -+echo "configure:7148: checking for hid_init in -lusb" >&5 -+ac_lib_var=`echo usb'_'hid_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 - else -- cat > conftest.$ac_ext <<EOF --#line 7136 "configure" -+ ac_save_LIBS="$LIBS" ++ echo "$as_me:$LINENO: checking for hid_init in -lusb" >&5 ++echo $ECHO_N "checking for hid_init in -lusb... $ECHO_C" >&6 ++if test "${ac_cv_lib_usb_hid_init+set}" = set; then ++ echo $ECHO_N "(cached) $ECHO_C" >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS +LIBS="-lusb $LIBS" -+cat > conftest.$ac_ext <<EOF -+#line 7156 "configure" - #include "confdefs.h" --#include <usbhid.h> ++cat >conftest.$ac_ext <<_ACEOF ++/* confdefs.h. */ ++_ACEOF ++cat confdefs.h >>conftest.$ac_ext ++cat >>conftest.$ac_ext <<_ACEOF ++/* end confdefs.h. */ ++ +/* Override any gcc2 internal prototype to avoid an error. */ ++#ifdef __cplusplus ++extern "C" ++#endif +/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char hid_init(); -+ -+int main() { -+hid_init() -+; return 0; } - EOF --ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:7141: \"$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 -+if { (eval echo configure:7167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* -- eval "ac_cv_header_$ac_safe=yes" -+ eval "ac_cv_lib_$ac_lib_var=yes" - else -- echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* -- eval "ac_cv_header_$ac_safe=no" -+ eval "ac_cv_lib_$ac_lib_var=no" - fi - rm -f conftest* -+LIBS="$ac_save_LIBS" ++ builtin and then its argument prototype would still apply. */ ++char hid_init (); ++int ++main () ++{ ++hid_init (); ++ ; ++ return 0; ++} ++_ACEOF ++rm -f conftest.$ac_objext conftest$ac_exeext ++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ++ (eval $ac_link) 2>conftest.er1 ++ ac_status=$? ++ grep -v '^ *+' conftest.er1 >conftest.err ++ rm -f conftest.er1 ++ cat conftest.err >&5 ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); } && ++ { ac_try='test -z "$ac_c_werror_flag" ++ || test ! -s conftest.err' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; } && ++ { ac_try='test -s conftest$ac_exeext' ++ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 ++ (eval $ac_try) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; }; then ++ ac_cv_lib_usb_hid_init=yes ++else ++ echo "$as_me: failed program was:" >&5 ++sed 's/^/| /' conftest.$ac_ext >&5 + - fi --if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- have_usbhid_h=yes ++ac_cv_lib_usb_hid_init=no ++fi ++rm -f conftest.err conftest.$ac_objext \ ++ conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++echo "$as_me:$LINENO: result: $ac_cv_lib_usb_hid_init" >&5 ++echo "${ECHO_T}$ac_cv_lib_usb_hid_init" >&6 ++if test $ac_cv_lib_usb_hid_init = yes; then + have_libusb=yes - else - echo "$ac_t""no" 1>&6 - fi - -- ac_safe=`echo "libusb.h" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for libusb.h""... $ac_c" 1>&6 --echo "configure:7164: checking for libusb.h" >&5 ++fi ++ + if test x$have_libusb = xyes; then + SYSTEM_LIBS="$SYSTEM_LIBS -lusb" + -+ ac_safe=`echo "usb.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for usb.h""... $ac_c" 1>&6 -+echo "configure:7192: checking for usb.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -7165,12 +7193,12 @@ if eval "test \"`echo '$''{'ac_cv_header - echo $ac_n "(cached) $ac_c" 1>&6 ++ if test "${ac_cv_header_usb_h+set}" = set; then ++ echo "$as_me:$LINENO: checking for usb.h" >&5 ++echo $ECHO_N "checking for usb.h... $ECHO_C" >&6 ++if test "${ac_cv_header_usb_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_libusb_h" >&5 +-echo "${ECHO_T}$ac_cv_header_libusb_h" >&6 ++echo "$as_me:$LINENO: result: $ac_cv_header_usb_h" >&5 ++echo "${ECHO_T}$ac_cv_header_usb_h" >&6 else - cat > conftest.$ac_ext <<EOF --#line 7169 "configure" -+#line 7197 "configure" - #include "confdefs.h" + # Is the header compilable? +-echo "$as_me:$LINENO: checking libusb.h usability" >&5 +-echo $ECHO_N "checking libusb.h usability... $ECHO_C" >&6 ++echo "$as_me:$LINENO: checking usb.h usability" >&5 ++echo $ECHO_N "checking usb.h usability... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -28129,7 +28133,7 @@ cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default +-#include <libusb.h> ++#include <usb.h> + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +@@ -28165,15 +28169,15 @@ echo "$as_me:$LINENO: result: $ac_header + echo "${ECHO_T}$ac_header_compiler" >&6 + + # Is the header present? +-echo "$as_me:$LINENO: checking libusb.h presence" >&5 +-echo $ECHO_N "checking libusb.h presence... $ECHO_C" >&6 ++echo "$as_me:$LINENO: checking usb.h presence" >&5 ++echo $ECHO_N "checking usb.h presence... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ -#include <libusb.h> +#include <usb.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:7174: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:7202: \"$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* -@@ -7186,14 +7214,14 @@ rm -f conftest* + _ACEOF + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +@@ -28207,25 +28211,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6 + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) +- { echo "$as_me:$LINENO: WARNING: libusb.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-echo "$as_me: WARNING: libusb.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: libusb.h: proceeding with the compiler's result" >&5 +-echo "$as_me: WARNING: libusb.h: proceeding with the compiler's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: usb.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: usb.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: usb.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: usb.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) +- { echo "$as_me:$LINENO: WARNING: libusb.h: present but cannot be compiled" >&5 +-echo "$as_me: WARNING: libusb.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: libusb.h: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: libusb.h: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: libusb.h: see the Autoconf documentation" >&5 +-echo "$as_me: WARNING: libusb.h: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: libusb.h: section \"Present But Cannot Be Compiled\"" >&5 +-echo "$as_me: WARNING: libusb.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: libusb.h: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: libusb.h: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: libusb.h: in the future, the compiler will take precedence" >&5 +-echo "$as_me: WARNING: libusb.h: in the future, the compiler will take precedence" >&2;} ++ { echo "$as_me:$LINENO: WARNING: usb.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: usb.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: usb.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: usb.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: usb.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: usb.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: usb.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: usb.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: usb.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: usb.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: usb.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: usb.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX + ## ------------------------------------------ ## +@@ -28236,34 +28240,34 @@ _ASBOX + sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-echo "$as_me:$LINENO: checking for libusb.h" >&5 +-echo $ECHO_N "checking for libusb.h... $ECHO_C" >&6 +-if test "${ac_cv_header_libusb_h+set}" = set; then ++echo "$as_me:$LINENO: checking for usb.h" >&5 ++echo $ECHO_N "checking for usb.h... $ECHO_C" >&6 ++if test "${ac_cv_header_usb_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_cv_header_libusb_h=$ac_header_preproc ++ ac_cv_header_usb_h=$ac_header_preproc fi - if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 +-echo "$as_me:$LINENO: result: $ac_cv_header_libusb_h" >&5 +-echo "${ECHO_T}$ac_cv_header_libusb_h" >&6 ++echo "$as_me:$LINENO: result: $ac_cv_header_usb_h" >&5 ++echo "${ECHO_T}$ac_cv_header_usb_h" >&6 + + fi +-if test $ac_cv_header_libusb_h = yes; then - have_libusb_h=yes ++if test $ac_cv_header_usb_h = yes; then + have_usb_h=yes - else - echo "$ac_t""no" 1>&6 fi -- ac_safe=`echo "libusbhid.h" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for libusbhid.h""... $ac_c" 1>&6 --echo "configure:7197: checking for libusbhid.h" >&5 -+ ac_safe=`echo "libusb.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for libusb.h""... $ac_c" 1>&6 -+echo "configure:7225: checking for libusb.h" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -7198,12 +7226,12 @@ if eval "test \"`echo '$''{'ac_cv_header - echo $ac_n "(cached) $ac_c" 1>&6 + +- if test "${ac_cv_header_libusbhid_h+set}" = set; then +- echo "$as_me:$LINENO: checking for libusbhid.h" >&5 +-echo $ECHO_N "checking for libusbhid.h... $ECHO_C" >&6 +-if test "${ac_cv_header_libusbhid_h+set}" = set; then ++ if test "${ac_cv_header_libusb_h+set}" = set; then ++ echo "$as_me:$LINENO: checking for libusb.h" >&5 ++echo $ECHO_N "checking for libusb.h... $ECHO_C" >&6 ++if test "${ac_cv_header_libusb_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_libusbhid_h" >&5 +-echo "${ECHO_T}$ac_cv_header_libusbhid_h" >&6 ++echo "$as_me:$LINENO: result: $ac_cv_header_libusb_h" >&5 ++echo "${ECHO_T}$ac_cv_header_libusb_h" >&6 else - cat > conftest.$ac_ext <<EOF --#line 7202 "configure" -+#line 7230 "configure" - #include "confdefs.h" + # Is the header compilable? +-echo "$as_me:$LINENO: checking libusbhid.h usability" >&5 +-echo $ECHO_N "checking libusbhid.h usability... $ECHO_C" >&6 ++echo "$as_me:$LINENO: checking libusb.h usability" >&5 ++echo $ECHO_N "checking libusb.h usability... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -28271,7 +28275,7 @@ cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default -#include <libusbhid.h> +#include <libusb.h> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:7207: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:7235: \"$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* -@@ -7219,7 +7247,7 @@ rm -f conftest* + _ACEOF + rm -f conftest.$ac_objext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +@@ -28307,15 +28311,15 @@ echo "$as_me:$LINENO: result: $ac_header + echo "${ECHO_T}$ac_header_compiler" >&6 + + # Is the header present? +-echo "$as_me:$LINENO: checking libusbhid.h presence" >&5 +-echo $ECHO_N "checking libusbhid.h presence... $ECHO_C" >&6 ++echo "$as_me:$LINENO: checking libusb.h presence" >&5 ++echo $ECHO_N "checking libusb.h presence... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <libusbhid.h> ++#include <libusb.h> + _ACEOF + if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +@@ -28349,25 +28353,25 @@ echo "${ECHO_T}$ac_header_preproc" >&6 + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) +- { echo "$as_me:$LINENO: WARNING: libusbhid.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-echo "$as_me: WARNING: libusbhid.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { echo "$as_me:$LINENO: WARNING: libusbhid.h: proceeding with the compiler's result" >&5 +-echo "$as_me: WARNING: libusbhid.h: proceeding with the compiler's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libusb.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++echo "$as_me: WARNING: libusb.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libusb.h: proceeding with the compiler's result" >&5 ++echo "$as_me: WARNING: libusb.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) +- { echo "$as_me:$LINENO: WARNING: libusbhid.h: present but cannot be compiled" >&5 +-echo "$as_me: WARNING: libusbhid.h: present but cannot be compiled" >&2;} +- { echo "$as_me:$LINENO: WARNING: libusbhid.h: check for missing prerequisite headers?" >&5 +-echo "$as_me: WARNING: libusbhid.h: check for missing prerequisite headers?" >&2;} +- { echo "$as_me:$LINENO: WARNING: libusbhid.h: see the Autoconf documentation" >&5 +-echo "$as_me: WARNING: libusbhid.h: see the Autoconf documentation" >&2;} +- { echo "$as_me:$LINENO: WARNING: libusbhid.h: section \"Present But Cannot Be Compiled\"" >&5 +-echo "$as_me: WARNING: libusbhid.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { echo "$as_me:$LINENO: WARNING: libusbhid.h: proceeding with the preprocessor's result" >&5 +-echo "$as_me: WARNING: libusbhid.h: proceeding with the preprocessor's result" >&2;} +- { echo "$as_me:$LINENO: WARNING: libusbhid.h: in the future, the compiler will take precedence" >&5 +-echo "$as_me: WARNING: libusbhid.h: in the future, the compiler will take precedence" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libusb.h: present but cannot be compiled" >&5 ++echo "$as_me: WARNING: libusb.h: present but cannot be compiled" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libusb.h: check for missing prerequisite headers?" >&5 ++echo "$as_me: WARNING: libusb.h: check for missing prerequisite headers?" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libusb.h: see the Autoconf documentation" >&5 ++echo "$as_me: WARNING: libusb.h: see the Autoconf documentation" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libusb.h: section \"Present But Cannot Be Compiled\"" >&5 ++echo "$as_me: WARNING: libusb.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libusb.h: proceeding with the preprocessor's result" >&5 ++echo "$as_me: WARNING: libusb.h: proceeding with the preprocessor's result" >&2;} ++ { echo "$as_me:$LINENO: WARNING: libusb.h: in the future, the compiler will take precedence" >&5 ++echo "$as_me: WARNING: libusb.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX + ## ------------------------------------------ ## +@@ -28378,33 +28382,29 @@ _ASBOX + sed "s/^/$as_me: WARNING: /" >&2 + ;; + esac +-echo "$as_me:$LINENO: checking for libusbhid.h" >&5 +-echo $ECHO_N "checking for libusbhid.h... $ECHO_C" >&6 +-if test "${ac_cv_header_libusbhid_h+set}" = set; then ++echo "$as_me:$LINENO: checking for libusb.h" >&5 ++echo $ECHO_N "checking for libusb.h... $ECHO_C" >&6 ++if test "${ac_cv_header_libusb_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- ac_cv_header_libusbhid_h=$ac_header_preproc ++ ac_cv_header_libusb_h=$ac_header_preproc + fi +-echo "$as_me:$LINENO: result: $ac_cv_header_libusbhid_h" >&5 +-echo "${ECHO_T}$ac_cv_header_libusbhid_h" >&6 ++echo "$as_me:$LINENO: result: $ac_cv_header_libusb_h" >&5 ++echo "${ECHO_T}$ac_cv_header_libusb_h" >&6 + fi - if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 +-if test $ac_cv_header_libusbhid_h = yes; then - have_libusbhid_h=yes ++if test $ac_cv_header_libusb_h = yes; then + have_libusb_h=yes - else - echo "$ac_t""no" 1>&6 fi -@@ -7227,14 +7255,10 @@ fi + + if test x$have_usb_h = xyes; then CFLAGS="$CFLAGS -DHAVE_USB_H" fi @@ -439,8 +893,8 @@ $NetBSD: patch-am,v 1.12 2003/09/04 09:57:43 wiz Exp $ + fi fi - echo $ac_n "checking for usbhid""... $ac_c" 1>&6 -@@ -7598,6 +7622,7 @@ __EOF__ + echo "$as_me:$LINENO: checking for usbhid" >&5 +@@ -28922,6 +28922,7 @@ __EOF__ CheckESD CheckNAS CheckX11 @@ -448,8 +902,8 @@ $NetBSD: patch-am,v 1.12 2003/09/04 09:57:43 wiz Exp $ CheckAAlib CheckOpenGL CheckPTHREAD -@@ -7616,9 +7641,9 @@ __EOF__ - +@@ -28929,9 +28930,9 @@ __EOF__ + CheckUSBHID # Set up files for the audio library if test x$enable_audio = xyes; then - CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT" @@ -461,7 +915,7 @@ $NetBSD: patch-am,v 1.12 2003/09/04 09:57:43 wiz Exp $ fi # Set up files for the cdrom library if test x$enable_cdrom = xyes; then -@@ -7627,9 +7652,6 @@ __EOF__ +@@ -28940,9 +28941,6 @@ __EOF__ fi # Set up files for the thread library if test x$enable_threads = xyes; then @@ -471,7 +925,7 @@ $NetBSD: patch-am,v 1.12 2003/09/04 09:57:43 wiz Exp $ CopyUnixThreadSource fi # Set up files for the timer library -@@ -9105,7 +9127,7 @@ fi +@@ -30425,7 +30423,7 @@ fi # Set runtime shared library paths as needed @@ -480,13 +934,13 @@ $NetBSD: patch-am,v 1.12 2003/09/04 09:57:43 wiz Exp $ SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib" fi if test $ARCH = solaris; then -@@ -9504,7 +9526,8 @@ s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g - s%@PKG_CONFIG@%$PKG_CONFIG%g - s%@DIRECTFB_CFLAGS@%$DIRECTFB_CFLAGS%g - s%@DIRECTFB_LIBS@%$DIRECTFB_LIBS%g --s%@PTH_CONFIG@%$PTH_CONFIG%g -+s%@AALIB_CONFIG@%$AALIB_CONFIG%g -+s%@PTHREAD_CONFIG@%$PTHREAD_CONFIG%g - s%@ARCH@%$ARCH%g - s%@TARGET_LINUX_TRUE@%$TARGET_LINUX_TRUE%g - s%@TARGET_LINUX_FALSE@%$TARGET_LINUX_FALSE%g +@@ -31564,7 +31562,8 @@ s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t + s,@PKG_CONFIG@,$PKG_CONFIG,;t t + s,@DIRECTFB_CFLAGS@,$DIRECTFB_CFLAGS,;t t + s,@DIRECTFB_LIBS@,$DIRECTFB_LIBS,;t t +-s,@PTH_CONFIG@,$PTH_CONFIG,;t t ++s,@AALIB_CONFIG@,$AALIB_CONFIG,;t t ++s,@PTHREAD_CONFIG@,$PTHREAD_CONFIG,;t t + s,@ARCH@,$ARCH,;t t + s,@TARGET_LINUX_TRUE@,$TARGET_LINUX_TRUE,;t t + s,@TARGET_LINUX_FALSE@,$TARGET_LINUX_FALSE,;t t |