$NetBSD: patch-aa,v 1.3 2008/02/10 11:04:32 shattered Exp $ --- configure.orig 2006-05-07 02:21:00.000000000 +0200 +++ configure @@ -357,7 +357,7 @@ ac_includes_default="\ # include #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 inststaticdir statedir build build_cpu build_vendor build_os LN_S blddir configuration CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP start_flags ld_switch_shared start_files ld lib_gcc RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA YACC SET_MAKE GTK_CONFIG X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS install_pp libs_xauth dnd_objs LIBSTDCPP dll_ld dll_cflags dll_ldflags dll_post dll_ldo ld_dynamic_link_flags with_modules MOD_CC MODARCHDIR MAKE_DOCFILE MODCFLAGS INSTALLPATH MOD_INSTALL_PROGRAM OBJECT_TO_BUILD have_pg_config lwlib_objs ALLOCA have_pkg_config have_libst_config have_xine_config have_esd_config have_artsc_config SRC_SUBDIR_DEPS INSTALL_ARCH_DEP_SUBDIR MAKE_SUBDIR SUBDIR_MAKEFILES PROGNAME MULE version old_version instvardir srcdir datarootdir extra_includes PREFIX_USER_DEFINED PREFIX EXEC_PREFIX_USER_DEFINED EXEC_PREFIX INFODIR_USER_DEFINED INFODIR infopath INFOPATH_USER_DEFINED INFOPATH package_path PACKAGE_PATH_USER_DEFINED PACKAGE_PATH lispdir LISPDIR_USER_DEFINED LISPDIR moduledir MODULEDIR_USER_DEFINED MODULEDIR sitelispdir SITELISPDIR_USER_DEFINED SITELISPDIR sitemoduledir SITEMODULEDIR_USER_DEFINED SITEMODULEDIR etcdir ETCDIR_USER_DEFINED ETCDIR archlibdir ARCHLIBDIR_USER_DEFINED ARCHLIBDIR docdir DOCDIR_USER_DEFINED DOCDIR bitmapdir extra_objs machfile opsysfile c_switch_general c_switch_window_system c_switch_all ld_switch_general ld_switch_window_system ld_switch_all ld_libs_general ld_libs_window_system ld_libs_all RECURSIVE_MAKE_ARGS sound_cflags dynodump_arch SXEMACS_CC XE_CFLAGS internal_makefile_list 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 inststaticdir statedir build build_cpu build_vendor build_os LN_S blddir configuration CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP start_flags ld_switch_shared start_files ld lib_gcc RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA YACC SET_MAKE GTK_CONFIG X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS install_pp libs_xauth dnd_objs LIBSTDCPP dll_ld dll_cflags dll_ldflags dll_post dll_ldo ld_dynamic_link_flags with_modules MOD_CC MODARCHDIR MAKE_DOCFILE MODCFLAGS INSTALLPATH MOD_INSTALL_PROGRAM OBJECT_TO_BUILD have_pg_config lwlib_objs ALLOCA LIBOSSAUDIO have_pkg_config have_libst_config have_xine_config have_esd_config have_artsc_config SRC_SUBDIR_DEPS INSTALL_ARCH_DEP_SUBDIR MAKE_SUBDIR SUBDIR_MAKEFILES PROGNAME MULE version old_version instvardir srcdir datarootdir extra_includes PREFIX_USER_DEFINED PREFIX EXEC_PREFIX_USER_DEFINED EXEC_PREFIX INFODIR_USER_DEFINED INFODIR infopath INFOPATH_USER_DEFINED INFOPATH package_path PACKAGE_PATH_USER_DEFINED PACKAGE_PATH lispdir LISPDIR_USER_DEFINED LISPDIR moduledir MODULEDIR_USER_DEFINED MODULEDIR sitelispdir SITELISPDIR_USER_DEFINED SITELISPDIR sitemoduledir SITEMODULEDIR_USER_DEFINED SITEMODULEDIR etcdir ETCDIR_USER_DEFINED ETCDIR archlibdir ARCHLIBDIR_USER_DEFINED ARCHLIBDIR docdir DOCDIR_USER_DEFINED DOCDIR bitmapdir extra_objs machfile opsysfile c_switch_general c_switch_window_system c_switch_all ld_switch_general ld_switch_window_system ld_switch_all ld_libs_general ld_libs_window_system ld_libs_all RECURSIVE_MAKE_ARGS sound_cflags dynodump_arch SXEMACS_CC XE_CFLAGS internal_makefile_list LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -9723,9 +9723,10 @@ case "$ac_cv_build" in case "ac_cv_build" in i[3-9]86-*-netbsd*) machine=intel386 ;; hp300-*-netbsd* | amiga-*-netbsd* | sun3-*-netbsd* | mac68k-*-netbsd* | da30-*-netbsd* | m68k-*-netbsd* ) - machine=hp9000s300 ;; + machine=m68k ;; pc532-*-netbsd* | ns32k-*-netbsd* ) machine=ns32000 ;; pmax-*-netbsd* | mips-*-netbsd* ) machine=pmax ;; + alpha-*-netbsd ) machine=alpha ;; esac ;; @@ -14893,7 +14894,7 @@ if test -n "$with_site_runtime_libraries LD_RUN_PATH="`echo $with_site_runtime_libraries | sed -e 's/ */:/g'`" export LD_RUN_PATH for path in $with_site_runtime_libraries; do - $ld_switch_run="$$ld_switch_run "-R$path "" && if test "$extra_verbose" = "yes"; then echo " Appending \""-R$path "\" to \$$ld_switch_run"; fi + ld_switch_run="$ld_switch_run -R$path" && if test "$extra_verbose" = "yes"; then echo " Appending \""-R$path "\" to \$ld_switch_run"; fi done fi @@ -14918,7 +14919,7 @@ echo $ECHO_N "checking for runtime libra decosf* | linux* | irix*) dash_r="-rpath " ;; *) dash_r="" - for try_dash_r in "-R" "-R " "-rpath "; do + for try_dash_r in "-Wl,R" "-R" "-R " "-rpath "; do xe_check_libs="${try_dash_r}/no/such/file-or-directory" if test "$GCC" = "yes"; then @@ -55535,6 +55536,41 @@ echo "$as_me: WARNING: --with-${feature} eval "with_${feature}=no" done fi +echo $ac_n "checking for main in -lossaudio""... $ac_c" 1>&6 +echo "configure:55540: checking for main in -lossaudio" >&5 +ac_lib_var=`echo ossaudio'_'main | sed 'y%./+-%__p_%'` + +xe_check_libs=" -lossaudio " +cat > conftest.$ac_ext <&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* +xe_check_libs="" + +if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then + echo "$ac_t""yes" 1>&6 + LIBOSSAUDIO=-lossaudio +else + echo "$ac_t""no" 1>&6 +fi test "$with_x11" = "yes" -o "$with_tty" = "yes" -o "$need_event_unixoid" = "yes" -o "$with_gtk" = "yes" -o "$with_gnome" = "yes" && extra_objs="$extra_objs event-unixoid.o" && if test "$extra_verbose" = "yes"; then echo " sxemacs will be linked with \"event-unixoid.o\"" fi @@ -58268,6 +58310,7 @@ s,@OBJECT_TO_BUILD@,$OBJECT_TO_BUILD,;t s,@have_pg_config@,$have_pg_config,;t t s,@lwlib_objs@,$lwlib_objs,;t t s,@ALLOCA@,$ALLOCA,;t t +s,@LIBOSSAUDIO@,$LIBOSSAUDIO,;t t s,@have_pkg_config@,$have_pkg_config,;t t s,@have_libst_config@,$have_libst_config,;t t s,@have_xine_config@,$have_xine_config,;t t