--- configure.orig 2016-12-11 00:52:23 UTC +++ configure @@ -813,6 +813,8 @@ HALD_COMPILE_SOLARIS_FALSE HALD_COMPILE_SOLARIS_TRUE HALD_COMPILE_FREEBSD_FALSE HALD_COMPILE_FREEBSD_TRUE +HALD_COMPILE_BSDSUNIX_FALSE +HALD_COMPILE_BSDSUNIX_TRUE HALD_COMPILE_LINUX_FALSE HALD_COMPILE_LINUX_TRUE HALD_COMPILE_DUMMY_FALSE @@ -1745,7 +1747,7 @@ Optional Packages: --with-html-dir=PATH path to installed docs --with-expat= Use expat from here --without-libpci Compile without pci support - --with-backend= backend to use (linux/solaris/freebsd/dummy) + --with-backend= backend to use (linux/solaris/bsdsunix/freebsd/dummy) --with-keymaps Re-map multimedia keys (auto) --with-deprecated-keys Add fdi-file to support deprecated/removed keys --with-dbus-sys= where D-BUS system.d directory is @@ -2508,7 +2510,7 @@ done # config.log. We remove comments because anyway the quotes in there # would cause problems or look ugly. # WARNING: Use '\'' to represent an apostrophe within the trap. -# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. +# WARNING: Do not start the trap code with a newline, due to a BSDSUniX 4.0 bug. trap 'exit_status=$? # Save into config.log some information that might help in debugging. { @@ -2889,7 +2891,7 @@ esac # Do `set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing +# (eg BSDSUniX returns the mod time of the symlink's containing # directory). if ( set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` @@ -6493,7 +6495,7 @@ else lt_cv_sys_max_cmd_len=8192; ;; - netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) + netbsd* | bsdsunix* | freebsd* | openbsd* | darwin* | dragonfly*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -6842,6 +6844,20 @@ darwin* | rhapsody*) lt_cv_deplibs_check_method=pass_all ;; +bsdsunix*) + if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then + case $host_cpu in + i*86 ) + lt_cv_deplibs_check_method='file_magic (BSDSUniX)/i[3-9]86 (compact )?demand paged shared library' + lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_test_file=`echo /lib/libc.so.*` + ;; + esac + else + lt_cv_deplibs_check_method=pass_all + fi + ;; + freebsd* | dragonfly*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then case $host_cpu in @@ -7521,8 +7537,8 @@ _LT_EOF {0, (void *) 0} }; -/* This works around a problem in FreeBSD linker */ -#ifdef FREEBSD_WORKAROUND +/* This works around a problem in BSDSUniX linker */ +#ifdef BSDSUNIX_WORKAROUND static const void *lt_preloaded_setup() { return lt__PROGRAM__LTX_preloaded_symbols; } @@ -7670,7 +7686,7 @@ ia64-*-hpux*) rm -rf conftest* ;; -x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ +x86_64-*kfreebsd*|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -7682,7 +7698,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux* case `/usr/bin/file conftest.o` in *32-bit*) case $host in - x86_64-*kfreebsd*-gnu) + x86_64-*kfreebsd*) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) @@ -7701,7 +7717,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux* ;; *64-bit*) case $host in - x86_64-*kfreebsd*-gnu) + x86_64-*kfreebsd*) LD="${LD-ld} -m elf_x86_64_fbsd" ;; x86_64-*linux*) @@ -10017,7 +10033,7 @@ $as_echo_n "checking whether the $compil hardcode_minus_L=no hardcode_shlibpath_var=unsupported inherit_rpath=no - link_all_deplibs=unknown + link_all_deplibs=no module_cmds= module_expsym_cmds= old_archive_from_new_cmds= @@ -10247,7 +10263,7 @@ _LT_EOF wlarc= else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib' fi ;; @@ -10266,7 +10282,7 @@ _LT_EOF _LT_EOF elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib' else ld_shlibs=no fi @@ -10295,7 +10311,7 @@ _LT_EOF if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib' else ld_shlibs=no fi @@ -10313,7 +10329,7 @@ _LT_EOF *) if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib' else ld_shlibs=no fi @@ -10603,7 +10619,7 @@ if test -z "$aix_libpath"; then aix_libp ld_shlibs=no ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor + # BSDSUniX 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little # extra space). @@ -10614,7 +10630,7 @@ if test -z "$aix_libpath"; then aix_libp hardcode_shlibpath_var=no ;; - # Unfortunately, older versions of FreeBSD 2 do not have this feature. + # Unfortunately, older versions of BSDSUniX 2 do not have this feature. freebsd2*) archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes @@ -10622,8 +10638,8 @@ if test -z "$aix_libpath"; then aix_libp hardcode_shlibpath_var=no ;; - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) + # BSDSUniX 3 and greater uses gcc -shared to do shared libraries. + bsdsunix* | freebsd* | dragonfly*) archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes @@ -10772,7 +10788,7 @@ rm -f core conftest.err conftest.$ac_obj hardcode_direct_absolute=yes if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' + archive_expsym_cmds='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-version-script,$lib-ver' hardcode_libdir_flag_spec='${wl}-rpath,$libdir' export_dynamic_flag_spec='${wl}-E' else @@ -11474,6 +11490,17 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; +bsdsunix*) + version_type=bsdsunix-elf + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${major}$shared_ext' + need_version=no + need_lib_prefix=no + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + freebsd1*) dynamic_linker=no ;; @@ -12537,7 +12564,7 @@ striplib= old_striplib= { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 $as_echo_n "checking whether stripping libraries is possible... " >&6; } -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then +if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "strip" >/dev/null; then test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" test -z "$striplib" && striplib="$STRIP --strip-unneeded" { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -12647,7 +12674,7 @@ hardcode_automatic_CXX=no inherit_rpath_CXX=no module_cmds_CXX= module_expsym_cmds_CXX= -link_all_deplibs_CXX=unknown +link_all_deplibs_CXX=no old_archive_cmds_CXX=$old_archive_cmds no_undefined_flag_CXX= whole_archive_flag_spec_CXX= @@ -12861,7 +12888,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld # archiving commands below assume that GNU ld is being used. if test "$with_gnu_ld" = yes; then archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib' hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' export_dynamic_flag_spec_CXX='${wl}--export-dynamic' @@ -13191,8 +13218,12 @@ if test -z "$aix_libpath"; then aix_libp archive_cmds_need_lc_CXX=no ;; - freebsd* | dragonfly*) - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF + bsdsunix-elf*) + archive_cmds_need_lc_CXX=no + ;; + + bsdsunix* | freebsd* | dragonfly*) + # BSDSUniX 3 and later use GNU C++ and GNU ld with standard ELF # conventions ld_shlibs_CXX=yes ;; @@ -13392,7 +13423,7 @@ if test -z "$aix_libpath"; then aix_libp case `$CC -V 2>&1` in *"Version 7."*) archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib' ;; *) # Version 8.0 or newer tmp_idyn= @@ -13400,7 +13431,7 @@ if test -z "$aix_libpath"; then aix_libp ia64*) tmp_idyn=' -i_dynamic';; esac archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script $wl$lib-ver -o $lib' ;; esac archive_cmds_need_lc_CXX=no @@ -13432,7 +13463,7 @@ if test -z "$aix_libpath"; then aix_libp ;; *) # Version 6 will use weak symbols archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-version-script ${wl}$lib-ver -o $lib' ;; esac @@ -13443,7 +13474,7 @@ if test -z "$aix_libpath"; then aix_libp cxx*) # Compaq C++ archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' + archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-version-script $wl$lib-ver' runpath_var=LD_RUN_PATH hardcode_libdir_flag_spec_CXX='-rpath $libdir' @@ -13477,7 +13508,7 @@ if test -z "$aix_libpath"; then aix_libp # Sun C++ 5.9 no_undefined_flag_CXX=' -zdefs' archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' + archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-version-script ${wl}$lib-ver' hardcode_libdir_flag_spec_CXX='-R$libdir' whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' compiler_needs_object_CXX=yes @@ -13550,7 +13581,7 @@ if test -z "$aix_libpath"; then aix_libp archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' + archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~ sed -e "s|$|;|" < $export_symbols >> $lib-ver~ echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-version-script,$lib-ver -o $lib' export_dynamic_flag_spec_CXX='${wl}-E' whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' fi @@ -14141,8 +14172,8 @@ $as_echo_n "checking for $compiler optio ;; esac ;; - freebsd* | dragonfly*) - # FreeBSD uses GNU C++ + bsdsunix* | freebsd* | dragonfly*) + # BSDSUniX and FreeBSD use GNU C++ ;; hpux9* | hpux10* | hpux11*) case $cc_basename in @@ -14942,6 +14973,17 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; +bsdsunix*) + version_type=bsdsunix-elf + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + need_version=no + need_lib_prefix=no + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=yes + hardcode_into_libs=yes + ;; + freebsd1*) dynamic_linker=no ;; @@ -17110,6 +17152,9 @@ else *-*-solaris*) HALD_BACKEND="solaris" ;; + *-*-bsdsunix*) + HALD_BACKEND="bsdsunix" + ;; *-*-freebsd* | *-*-kfreebsd*-gnu) HALD_BACKEND="freebsd" ;; @@ -17137,6 +17182,14 @@ else HALD_COMPILE_LINUX_FALSE= fi + if test x$HALD_BACKEND = xbsdsunix; then + HALD_COMPILE_BSDSUNIX_TRUE= + HALD_COMPILE_BSDSUNIX_FALSE='#' +else + HALD_COMPILE_BSDSUNIX_TRUE='#' + HALD_COMPILE_BSDSUNIX_FALSE= +fi + if test x$HALD_BACKEND = xfreebsd; then HALD_COMPILE_FREEBSD_TRUE= HALD_COMPILE_FREEBSD_FALSE='#' @@ -17154,6 +17207,50 @@ else fi +if test "x$HALD_BACKEND" = "xbsdsunix"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb20_dev_get_info in -lusb20" >&5 +$as_echo_n "checking for libusb20_dev_get_info in -lusb20... " >&6; } +if test "${ac_cv_lib_usb20_libusb20_dev_get_info+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lusb20 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char libusb20_dev_get_info (); +int +main () +{ +return libusb20_dev_get_info (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_usb20_libusb20_dev_get_info=yes +else + ac_cv_lib_usb20_libusb20_dev_get_info=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_usb20_libusb20_dev_get_info" >&5 +$as_echo "$ac_cv_lib_usb20_libusb20_dev_get_info" >&6; } +if test "x$ac_cv_lib_usb20_libusb20_dev_get_info" = x""yes; then : + USE_LIBUSB20=yes +else + USE_LIBUSB20=no +fi + +fi if test "x$HALD_BACKEND" = "xfreebsd"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libusb20_dev_get_info in -lusb20" >&5 $as_echo_n "checking for libusb20_dev_get_info in -lusb20... " >&6; } @@ -17954,7 +18051,7 @@ fi $as_echo "$have_glib_2_14" >&6; } case "$host" in - *-*-freebsd*) + *-*-bsdsunix* | *-*-freebsd*) pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for VOLUME_ID" >&5 @@ -18054,6 +18151,8 @@ esac # blkid (util-linux-ng) case "$host" in +*-*-bsdsunix*) + ;; *-*-freebsd*) ;; *-*-solaris*) @@ -18739,7 +18838,7 @@ fi ac_config_headers="$ac_config_headers config.h" -ac_config_files="$ac_config_files hal.pc hal-storage.pc hal.conf Makefile hald/Makefile hald/dummy/Makefile hald/linux/Makefile hald/linux/probing/Makefile hald/linux/addons/Makefile hald/solaris/Makefile hald/solaris/probing/Makefile hald/solaris/addons/Makefile hald/freebsd/Makefile hald/freebsd/probing/Makefile hald/freebsd/libprobe/Makefile hald/freebsd/addons/Makefile hald-runner/Makefile libhal/Makefile libhal-storage/Makefile tools/Makefile tools/freebsd/Makefile tools/linux/Makefile partutil/Makefile policy/Makefile fdi/Makefile fdi/information/Makefile fdi/information/10freedesktop/Makefile fdi/information/20thirdparty/Makefile fdi/policy/Makefile fdi/policy/10osvendor/Makefile fdi/policy/20thirdparty/Makefile fdi/preprobe/Makefile fdi/preprobe/10freedesktop/Makefile fdi/preprobe/20thirdparty/Makefile doc/Makefile doc/api/Makefile doc/api/libhal/Makefile doc/api/libhal/version.xml doc/api/libhal-storage/Makefile doc/api/libhal-storage/version.xml doc/spec/Makefile doc/spec/hal-spec.xml.in doc/man/Makefile" +ac_config_files="$ac_config_files hal.pc hal-storage.pc hal.conf Makefile hald/Makefile hald/dummy/Makefile hald/linux/Makefile hald/linux/probing/Makefile hald/linux/addons/Makefile hald/solaris/Makefile hald/solaris/probing/Makefile hald/solaris/addons/Makefile hald/bsdsunix/Makefile hald/freebsd/Makefile hald/bsdsunix/probing/Makefile hald/freebsd/probing/Makefile hald/bsdsunix/libprobe/Makefile hald/freebsd/libprobe/Makefile hald/bsdsunix/addons/Makefile hald/freebsd/addons/Makefile hald-runner/Makefile libhal/Makefile libhal-storage/Makefile tools/Makefile tools/bsdsunix/Makefile tools/freebsd/Makefile tools/linux/Makefile partutil/Makefile policy/Makefile fdi/Makefile fdi/information/Makefile fdi/information/10freedesktop/Makefile fdi/information/20thirdparty/Makefile fdi/policy/Makefile fdi/policy/10osvendor/Makefile fdi/policy/20thirdparty/Makefile fdi/preprobe/Makefile fdi/preprobe/10freedesktop/Makefile fdi/preprobe/20thirdparty/Makefile doc/Makefile doc/api/Makefile doc/api/libhal/Makefile doc/api/libhal/version.xml doc/api/libhal-storage/Makefile doc/api/libhal-storage/version.xml doc/spec/Makefile doc/spec/hal-spec.xml.in doc/man/Makefile" cat >confcache <<\_ACEOF @@ -18939,8 +19038,12 @@ if test -z "${HALD_COMPILE_LINUX_TRUE}" as_fn_error "conditional \"HALD_COMPILE_LINUX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${HALD_COMPILE_FREEBSD_TRUE}" && test -z "${HALD_COMPILE_FREEBSD_FALSE}"; then - as_fn_error "conditional \"HALD_COMPILE_FREEBSD\" was never defined. +if test -z "${HALD_COMPILE_BSDSUNIX_TRUE}" && test -z "${HALD_COMPILE_BSDSUNIX_FALSE}"; then + as_fn_error "conditional \"HALD_COMPILE_BSDSUNIX\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi +if test -z "${HALD_COMPILE_BSDSUNIX_TRUE}" && test -z "${HALD_COMPILE_BSDSUNIX_FALSE}"; then + as_fn_error "conditional \"HALD_COMPILE_BSDSUNIX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HALD_COMPILE_SOLARIS_TRUE}" && test -z "${HALD_COMPILE_SOLARIS_FALSE}"; then @@ -20022,6 +20125,10 @@ do "hald/solaris/Makefile") CONFIG_FILES="$CONFIG_FILES hald/solaris/Makefile" ;; "hald/solaris/probing/Makefile") CONFIG_FILES="$CONFIG_FILES hald/solaris/probing/Makefile" ;; "hald/solaris/addons/Makefile") CONFIG_FILES="$CONFIG_FILES hald/solaris/addons/Makefile" ;; + "hald/bsdsunix/Makefile") CONFIG_FILES="$CONFIG_FILES hald/bsdsunix/Makefile" ;; + "hald/bsdsunix/probing/Makefile") CONFIG_FILES="$CONFIG_FILES hald/bsdsunix/probing/Makefile" ;; + "hald/bsdsunix/libprobe/Makefile") CONFIG_FILES="$CONFIG_FILES hald/bsdsunix/libprobe/Makefile" ;; + "hald/bsdsunix/addons/Makefile") CONFIG_FILES="$CONFIG_FILES hald/bsdsunix/addons/Makefile" ;; "hald/freebsd/Makefile") CONFIG_FILES="$CONFIG_FILES hald/freebsd/Makefile" ;; "hald/freebsd/probing/Makefile") CONFIG_FILES="$CONFIG_FILES hald/freebsd/probing/Makefile" ;; "hald/freebsd/libprobe/Makefile") CONFIG_FILES="$CONFIG_FILES hald/freebsd/libprobe/Makefile" ;; @@ -20030,6 +20137,7 @@ do "libhal/Makefile") CONFIG_FILES="$CONFIG_FILES libhal/Makefile" ;; "libhal-storage/Makefile") CONFIG_FILES="$CONFIG_FILES libhal-storage/Makefile" ;; "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; + "tools/bsdsunix/Makefile") CONFIG_FILES="$CONFIG_FILES tools/bsdsunix/Makefile" ;; "tools/freebsd/Makefile") CONFIG_FILES="$CONFIG_FILES tools/freebsd/Makefile" ;; "tools/linux/Makefile") CONFIG_FILES="$CONFIG_FILES tools/linux/Makefile" ;; "partutil/Makefile") CONFIG_FILES="$CONFIG_FILES partutil/Makefile" ;;