From: Eric Biggers Date: Fri, 4 May 2012 03:32:22 +0000 (-0500) Subject: Changes to compile wimlib on FreeBSD. X-Git-Tag: v0.7.0~11 X-Git-Url: https://wimlib.net/git/?p=wimlib;a=commitdiff_plain;h=ad70b091b63707f568cf5066a50aa05436baf253 Changes to compile wimlib on FreeBSD. --- diff --git a/README b/README index 92495344..c210fce9 100644 --- a/README +++ b/README @@ -123,22 +123,15 @@ Retrieving files from the Windows Automated Installation Kit requires PORTABILITY -I have been developing and testing wimlib on x86_64 (64-bit) GNU/Linux. +wimlib has mostly been developed and tested on x86_64 (64-bit) GNU/Linux. -wimlib has been tested on x86 (32-bit) GNU/Linux occasionally. +It has been tested on x86 (32-bit) GNU/Linux occasionally. -I have not tried to compile wimlib with compilers other than gcc. +It can also be compiled and run on FreeBSD. -It should be possible to compile wimlib on other UNIX systems such as FreeBSD. -If this doesn't work, let me know. If libfuse is not available, try compiling -with --without-fuse. +wimlib should work on big endian machines but it has not been tested. -While the code has been tested on a little endian machine, it has been written -to work on big endian machines as well. (See endianness.h). However it has -never actually been tested on a big endian machine. Let me know if it doesn't -work. - -I am not planning to port wimlib to Windows since the programming interface on +There are no plans to port wimlib to Windows since the programming interface on Windows is very different and Microsoft's imagex.exe is already available. ------------------------------------------------------------------------------ diff --git a/autom4te.cache/output.0 b/autom4te.cache/output.0 index ef3af7f3..9ba0962a 100644 --- a/autom4te.cache/output.0 +++ b/autom4te.cache/output.0 @@ -13454,8 +13454,6 @@ if test "x$WITH_FUSE" = "xyes"; then $as_echo "@%:@define WITH_FUSE 1" >>confdefs.h - LIBFUSE_LDADD=`pkg-config --libs fuse` - LIBFUSE_CFLAGS=`pkg-config --cflags fuse` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fuse_main_real in -lfuse" >&5 $as_echo_n "checking for fuse_main_real in -lfuse... " >&6; } @@ -13550,6 +13548,8 @@ else fi + LIBFUSE_LDADD="`pkg-config --libs fuse` -lrt" + LIBFUSE_CFLAGS="`pkg-config --cflags fuse`" else LIBFUSE_LDADD= LIBFUSE_CFLAGS= @@ -13699,8 +13699,11 @@ if test "x$WITH_LIBCRYPTO" = "xyes" -a "x$ENABLE_SSSE3_SHA1" = "xno"; then $as_echo "@%:@define WITH_LIBCRYPTO 1" >>confdefs.h - LIBCRYPTO_LDADD=`pkg-config --libs libcrypto` - LIBCRYPTO_CFLAGS=`pkg-config --cflags libcrypto` + LIBCRYPTO_LDADD=`pkg-config --libs libcrypto 2>/dev/null` + if test $? -ne 0; then + LIBCRYPTO_LDADD=-lcrypto; + fi + LIBCRYPTO_CFLAGS=`pkg-config --cflags libcrypto 2>/dev/null` else LIBCRYPTO_LDADD= LIBCRYPTO_CFLAGS= diff --git a/autom4te.cache/output.1 b/autom4te.cache/output.1 index ef3af7f3..9ba0962a 100644 --- a/autom4te.cache/output.1 +++ b/autom4te.cache/output.1 @@ -13454,8 +13454,6 @@ if test "x$WITH_FUSE" = "xyes"; then $as_echo "@%:@define WITH_FUSE 1" >>confdefs.h - LIBFUSE_LDADD=`pkg-config --libs fuse` - LIBFUSE_CFLAGS=`pkg-config --cflags fuse` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fuse_main_real in -lfuse" >&5 $as_echo_n "checking for fuse_main_real in -lfuse... " >&6; } @@ -13550,6 +13548,8 @@ else fi + LIBFUSE_LDADD="`pkg-config --libs fuse` -lrt" + LIBFUSE_CFLAGS="`pkg-config --cflags fuse`" else LIBFUSE_LDADD= LIBFUSE_CFLAGS= @@ -13699,8 +13699,11 @@ if test "x$WITH_LIBCRYPTO" = "xyes" -a "x$ENABLE_SSSE3_SHA1" = "xno"; then $as_echo "@%:@define WITH_LIBCRYPTO 1" >>confdefs.h - LIBCRYPTO_LDADD=`pkg-config --libs libcrypto` - LIBCRYPTO_CFLAGS=`pkg-config --cflags libcrypto` + LIBCRYPTO_LDADD=`pkg-config --libs libcrypto 2>/dev/null` + if test $? -ne 0; then + LIBCRYPTO_LDADD=-lcrypto; + fi + LIBCRYPTO_CFLAGS=`pkg-config --cflags libcrypto 2>/dev/null` else LIBCRYPTO_LDADD= LIBCRYPTO_CFLAGS= diff --git a/autom4te.cache/requests b/autom4te.cache/requests index 4324d28c..38a2931f 100644 --- a/autom4te.cache/requests +++ b/autom4te.cache/requests @@ -62,8 +62,8 @@ '_m4_warn' => 1, 'AC_LIBTOOL_OBJDIR' => 1, 'gl_FUNC_ARGZ' => 1, - 'LTOBSOLETE_VERSION' => 1, 'AM_SANITY_CHECK' => 1, + 'LTOBSOLETE_VERSION' => 1, 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1, 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1, 'LT_LIB_M' => 1, @@ -77,20 +77,20 @@ '_LT_WITH_SYSROOT' => 1, 'LT_SYS_DLOPEN_DEPLIBS' => 1, 'LT_FUNC_DLSYM_USCORE' => 1, - 'AC_LIB_ARG_WITH' => 1, - 'AC_LIBTOOL_CONFIG' => 1, '_LT_AC_LANG_F77' => 1, - 'AC_LTDL_DLLIB' => 1, + 'AC_LIBTOOL_CONFIG' => 1, + 'AC_LIB_ARG_WITH' => 1, '_AM_SUBST_NOTMAKE' => 1, + 'AC_LTDL_DLLIB' => 1, '_AM_AUTOCONF_VERSION' => 1, 'AM_DISABLE_SHARED' => 1, '_LT_PROG_ECHO_BACKSLASH' => 1, '_LTDL_SETUP' => 1, - 'AM_PROG_LIBTOOL' => 1, '_LT_AC_LANG_CXX' => 1, - 'AM_PROG_LD' => 1, - '_LT_AC_FILE_LTDLL_C' => 1, + 'AM_PROG_LIBTOOL' => 1, 'AC_LIB_LTDL' => 1, + '_LT_AC_FILE_LTDLL_C' => 1, + 'AM_PROG_LD' => 1, 'AM_ICONV_LINK' => 1, 'AC_LIB_PREPARE_MULTILIB' => 1, 'AU_DEFUN' => 1, @@ -111,47 +111,47 @@ 'AC_LIBTOOL_PROG_CC_C_O' => 1, 'gl_PREREQ_ARGZ' => 1, 'AC_LIB_PREFIX' => 1, - 'LT_SUPPORTED_TAG' => 1, 'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - 'LT_PROG_RC' => 1, + 'LT_SUPPORTED_TAG' => 1, 'LT_SYS_MODULE_EXT' => 1, + 'LT_PROG_RC' => 1, 'AC_DEFUN_ONCE' => 1, '_LT_AC_LANG_GCJ' => 1, 'AC_' => 1, 'AC_LTDL_OBJDIR' => 1, '_LT_PATH_TOOL_PREFIX' => 1, - 'AM_ICONV' => 1, 'AC_LIBTOOL_RC' => 1, - '_LT_AC_PROG_ECHO_BACKSLASH' => 1, - 'AC_DISABLE_FAST_INSTALL' => 1, + 'AM_ICONV' => 1, 'AM_SILENT_RULES' => 1, - 'include' => 1, - '_LT_AC_TRY_DLOPEN_SELF' => 1, + 'AC_DISABLE_FAST_INSTALL' => 1, + '_LT_AC_PROG_ECHO_BACKSLASH' => 1, '_LT_AC_SYS_LIBPATH_AIX' => 1, + '_LT_AC_TRY_DLOPEN_SELF' => 1, + 'include' => 1, 'LT_AC_PROG_SED' => 1, 'AM_ENABLE_SHARED' => 1, 'AC_LIB_APPENDTOVAR' => 1, - 'AM_PROG_AR' => 1, 'LTDL_INSTALLABLE' => 1, + 'AM_PROG_AR' => 1, '_LT_AC_LANG_GCJ_CONFIG' => 1, 'AC_ENABLE_SHARED' => 1, 'AC_LIB_WITH_FINAL_PREFIX' => 1, - '_LT_REQUIRED_DARWIN_CHECKS' => 1, - 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, 'AC_ENABLE_STATIC' => 1, + 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, + '_LT_REQUIRED_DARWIN_CHECKS' => 1, '_LT_AC_TAGVAR' => 1, 'AC_LIBTOOL_LANG_F77_CONFIG' => 1, 'AM_CONDITIONAL' => 1, 'LT_LIB_DLLOAD' => 1, - 'LTVERSION_VERSION' => 1, - '_LT_PROG_CXX' => 1, - '_LT_PROG_F77' => 1, 'LTDL_INIT' => 1, - 'm4_include' => 1, + '_LT_PROG_F77' => 1, + '_LT_PROG_CXX' => 1, + 'LTVERSION_VERSION' => 1, 'AM_PROG_INSTALL_SH' => 1, + 'm4_include' => 1, 'AC_PROG_EGREP' => 1, - 'AC_PATH_MAGIC' => 1, '_AC_AM_CONFIG_HEADER_HOOK' => 1, + 'AC_PATH_MAGIC' => 1, 'AC_LTDL_SYSSEARCHPATH' => 1, 'AM_MAKE_INCLUDE' => 1, 'LT_CMD_MAX_LEN' => 1, @@ -174,37 +174,37 @@ 'LT_OUTPUT' => 1, 'AC_LIB_PROG_LD_GNU' => 1, 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1, - 'AC_WITH_LTDL' => 1, 'AC_LIBTOOL_LINKER_OPTION' => 1, - 'LT_AC_PROG_RC' => 1, + 'AC_WITH_LTDL' => 1, 'AC_LIBTOOL_CXX' => 1, + 'LT_AC_PROG_RC' => 1, 'LT_INIT' => 1, - 'LT_AC_PROG_GCJ' => 1, 'LT_SYS_DLOPEN_SELF' => 1, - 'AM_DEP_TRACK' => 1, - 'AM_DISABLE_STATIC' => 1, + 'LT_AC_PROG_GCJ' => 1, '_LT_AC_PROG_CXXCPP' => 1, + 'AM_DISABLE_STATIC' => 1, + 'AM_DEP_TRACK' => 1, '_AC_PROG_LIBTOOL' => 1, '_AM_IF_OPTION' => 1, 'AC_PATH_TOOL_PREFIX' => 1, - 'm4_pattern_allow' => 1, 'AC_LIBTOOL_F77' => 1, + 'm4_pattern_allow' => 1, 'AM_SET_LEADING_DOT' => 1, - '_LT_PROG_FC' => 1, 'LT_AC_PROG_EGREP' => 1, + '_LT_PROG_FC' => 1, '_AM_DEPENDENCIES' => 1, 'AC_LIBTOOL_LANG_C_CONFIG' => 1, 'LTOPTIONS_VERSION' => 1, - 'AC_LIB_LINKFLAGS' => 1, '_LT_AC_SYS_COMPILER' => 1, + 'AC_LIB_LINKFLAGS' => 1, 'AM_PROG_NM' => 1, 'AC_LIBLTDL_CONVENIENCE' => 1, 'AC_DEPLIBS_CHECK_METHOD' => 1, - 'AC_LIBLTDL_INSTALLABLE' => 1, 'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1, + 'AC_LIBLTDL_INSTALLABLE' => 1, 'AC_LTDL_ENABLE_INSTALL' => 1, - 'LT_PROG_GCJ' => 1, 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, + 'LT_PROG_GCJ' => 1, 'AM_INIT_AUTOMAKE' => 1, 'AC_DISABLE_STATIC' => 1, 'LT_PATH_NM' => 1, @@ -213,28 +213,28 @@ '_LT_AC_LANG_RC_CONFIG' => 1, 'LT_PROG_GO' => 1, 'LT_SYS_MODULE_PATH' => 1, - 'LT_WITH_LTDL' => 1, 'AC_LIBTOOL_POSTDEP_PREDEP' => 1, + 'LT_WITH_LTDL' => 1, 'AC_LTDL_SHLIBPATH' => 1, 'AM_AUX_DIR_EXPAND' => 1, 'AC_LIB_LINKFLAGS_FROM_LIBS' => 1, - 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, '_LT_AC_LANG_F77_CONFIG' => 1, - '_LT_COMPILER_OPTION' => 1, + 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, '_AM_SET_OPTIONS' => 1, - 'AM_RUN_LOG' => 1, + '_LT_COMPILER_OPTION' => 1, '_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1, - 'AC_LIBTOOL_PICMODE' => 1, - 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1, + 'AM_RUN_LOG' => 1, 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1, + 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1, + 'AC_LIBTOOL_PICMODE' => 1, 'AC_LIB_LINKFLAGS_BODY' => 1, - 'AC_CHECK_LIBM' => 1, 'LT_PATH_LD' => 1, - 'AC_LIB_FROMPACKAGE' => 1, + 'AC_CHECK_LIBM' => 1, 'AC_LIBTOOL_SYS_LIB_STRIP' => 1, + 'AC_LIB_FROMPACKAGE' => 1, '_AM_MANGLE_OPTION' => 1, - 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, 'AC_LTDL_SYMBOL_USCORE' => 1, + 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, 'AM_SET_DEPDIR' => 1, '_LT_CC_BASENAME' => 1, 'AX_PROG_NASM' => 1, @@ -254,57 +254,57 @@ 'configure.ac' ], { - '_LT_AC_TAGCONFIG' => 1, 'AM_PROG_F77_C_O' => 1, - 'AC_INIT' => 1, + '_LT_AC_TAGCONFIG' => 1, 'm4_pattern_forbid' => 1, - 'AC_CANONICAL_TARGET' => 1, + 'AC_INIT' => 1, '_AM_COND_IF' => 1, - 'AC_CONFIG_LIBOBJ_DIR' => 1, + 'AC_CANONICAL_TARGET' => 1, 'AC_SUBST' => 1, - 'AC_CANONICAL_HOST' => 1, + 'AC_CONFIG_LIBOBJ_DIR' => 1, 'AC_FC_SRCEXT' => 1, + 'AC_CANONICAL_HOST' => 1, 'AC_PROG_LIBTOOL' => 1, 'AM_INIT_AUTOMAKE' => 1, - 'AC_CONFIG_SUBDIRS' => 1, 'AM_PATH_GUILE' => 1, + 'AC_CONFIG_SUBDIRS' => 1, 'AM_AUTOMAKE_VERSION' => 1, 'LT_CONFIG_LTDL_DIR' => 1, - 'AC_CONFIG_LINKS' => 1, 'AC_REQUIRE_AUX_FILE' => 1, - 'm4_sinclude' => 1, + 'AC_CONFIG_LINKS' => 1, 'LT_SUPPORTED_TAG' => 1, + 'm4_sinclude' => 1, 'AM_MAINTAINER_MODE' => 1, 'AM_NLS' => 1, 'AC_FC_PP_DEFINE' => 1, 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, - '_m4_warn' => 1, 'AM_MAKEFILE_INCLUDE' => 1, + '_m4_warn' => 1, 'AM_PROG_CXX_C_O' => 1, - '_AM_COND_ENDIF' => 1, '_AM_MAKEFILE_INCLUDE' => 1, + '_AM_COND_ENDIF' => 1, 'AM_ENABLE_MULTILIB' => 1, 'AM_PROG_MOC' => 1, 'AM_SILENT_RULES' => 1, 'AC_CONFIG_FILES' => 1, - 'include' => 1, 'LT_INIT' => 1, - 'AM_GNU_GETTEXT' => 1, + 'include' => 1, 'AM_PROG_AR' => 1, + 'AM_GNU_GETTEXT' => 1, 'AC_LIBSOURCE' => 1, - 'AC_CANONICAL_BUILD' => 1, 'AM_PROG_FC_C_O' => 1, + 'AC_CANONICAL_BUILD' => 1, 'AC_FC_FREEFORM' => 1, - 'AC_FC_PP_SRCEXT' => 1, 'AH_OUTPUT' => 1, - 'AC_CONFIG_AUX_DIR' => 1, + 'AC_FC_PP_SRCEXT' => 1, '_AM_SUBST_NOTMAKE' => 1, - 'AM_PROG_CC_C_O' => 1, - 'sinclude' => 1, + 'AC_CONFIG_AUX_DIR' => 1, 'm4_pattern_allow' => 1, - 'AM_CONDITIONAL' => 1, - 'AC_CANONICAL_SYSTEM' => 1, + 'sinclude' => 1, + 'AM_PROG_CC_C_O' => 1, 'AM_XGETTEXT_OPTION' => 1, + 'AC_CANONICAL_SYSTEM' => 1, + 'AM_CONDITIONAL' => 1, 'AC_CONFIG_HEADERS' => 1, 'AC_DEFINE_TRACE_LITERAL' => 1, 'AM_POT_TOOLS' => 1, diff --git a/autom4te.cache/traces.0 b/autom4te.cache/traces.0 index cccfcaa8..47a60747 100644 --- a/autom4te.cache/traces.0 +++ b/autom4te.cache/traces.0 @@ -3771,16 +3771,16 @@ m4trace:configure.ac:182: -1- m4_pattern_allow([^nasm$]) m4trace:configure.ac:183: -1- m4_pattern_allow([^NASM$]) m4trace:configure.ac:187: -1- m4_pattern_allow([^SSSE3_SHA1_OBJ$]) m4trace:configure.ac:207: -1- m4_pattern_allow([^WITH_LIBCRYPTO$]) -m4trace:configure.ac:214: -1- m4_pattern_allow([^LIBCRYPTO_LDADD$]) -m4trace:configure.ac:215: -1- m4_pattern_allow([^LIBCRYPTO_CFLAGS$]) -m4trace:configure.ac:216: -1- m4_pattern_allow([^SHA1_SOURCES$]) -m4trace:configure.ac:218: -1- m4_pattern_allow([^LIB@&t@OBJS$]) -m4trace:configure.ac:218: -1- m4_pattern_allow([^LTLIBOBJS$]) -m4trace:configure.ac:218: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"]) -m4trace:configure.ac:218: -1- m4_pattern_allow([^am__EXEEXT_TRUE$]) -m4trace:configure.ac:218: -1- m4_pattern_allow([^am__EXEEXT_FALSE$]) -m4trace:configure.ac:218: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE]) -m4trace:configure.ac:218: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE]) -m4trace:configure.ac:218: -1- _AC_AM_CONFIG_HEADER_HOOK(["$ac_file"]) -m4trace:configure.ac:218: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS -m4trace:configure.ac:218: -1- _LT_PROG_LTMAIN +m4trace:configure.ac:217: -1- m4_pattern_allow([^LIBCRYPTO_LDADD$]) +m4trace:configure.ac:218: -1- m4_pattern_allow([^LIBCRYPTO_CFLAGS$]) +m4trace:configure.ac:219: -1- m4_pattern_allow([^SHA1_SOURCES$]) +m4trace:configure.ac:221: -1- m4_pattern_allow([^LIB@&t@OBJS$]) +m4trace:configure.ac:221: -1- m4_pattern_allow([^LTLIBOBJS$]) +m4trace:configure.ac:221: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"]) +m4trace:configure.ac:221: -1- m4_pattern_allow([^am__EXEEXT_TRUE$]) +m4trace:configure.ac:221: -1- m4_pattern_allow([^am__EXEEXT_FALSE$]) +m4trace:configure.ac:221: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE]) +m4trace:configure.ac:221: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE]) +m4trace:configure.ac:221: -1- _AC_AM_CONFIG_HEADER_HOOK(["$ac_file"]) +m4trace:configure.ac:221: -1- _AM_OUTPUT_DEPENDENCY_COMMANDS +m4trace:configure.ac:221: -1- _LT_PROG_LTMAIN diff --git a/autom4te.cache/traces.1 b/autom4te.cache/traces.1 index 8ed2a629..a00e4b71 100644 --- a/autom4te.cache/traces.1 +++ b/autom4te.cache/traces.1 @@ -664,39 +664,39 @@ m4trace:configure.ac:207: -1- AC_DEFINE_TRACE_LITERAL([WITH_LIBCRYPTO]) m4trace:configure.ac:207: -1- m4_pattern_allow([^WITH_LIBCRYPTO$]) m4trace:configure.ac:207: -1- AH_OUTPUT([WITH_LIBCRYPTO], [/* Define to 1 if using libcrypto SHA1 */ @%:@undef WITH_LIBCRYPTO]) -m4trace:configure.ac:214: -1- AC_SUBST([LIBCRYPTO_LDADD], [$LIBCRYPTO_LDADD]) -m4trace:configure.ac:214: -1- AC_SUBST_TRACE([LIBCRYPTO_LDADD]) -m4trace:configure.ac:214: -1- m4_pattern_allow([^LIBCRYPTO_LDADD$]) -m4trace:configure.ac:215: -1- AC_SUBST([LIBCRYPTO_CFLAGS], [$LIBCRYPTO_CFLAGS]) -m4trace:configure.ac:215: -1- AC_SUBST_TRACE([LIBCRYPTO_CFLAGS]) -m4trace:configure.ac:215: -1- m4_pattern_allow([^LIBCRYPTO_CFLAGS$]) -m4trace:configure.ac:216: -1- AC_SUBST([SHA1_SOURCES], [$SHA1_SOURCES]) -m4trace:configure.ac:216: -1- AC_SUBST_TRACE([SHA1_SOURCES]) -m4trace:configure.ac:216: -1- m4_pattern_allow([^SHA1_SOURCES$]) -m4trace:configure.ac:218: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs]) -m4trace:configure.ac:218: -1- AC_SUBST_TRACE([LIB@&t@OBJS]) -m4trace:configure.ac:218: -1- m4_pattern_allow([^LIB@&t@OBJS$]) -m4trace:configure.ac:218: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs]) -m4trace:configure.ac:218: -1- AC_SUBST_TRACE([LTLIBOBJS]) -m4trace:configure.ac:218: -1- m4_pattern_allow([^LTLIBOBJS$]) -m4trace:configure.ac:218: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"]) -m4trace:configure.ac:218: -1- AC_SUBST([am__EXEEXT_TRUE]) -m4trace:configure.ac:218: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE]) -m4trace:configure.ac:218: -1- m4_pattern_allow([^am__EXEEXT_TRUE$]) -m4trace:configure.ac:218: -1- AC_SUBST([am__EXEEXT_FALSE]) -m4trace:configure.ac:218: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE]) -m4trace:configure.ac:218: -1- m4_pattern_allow([^am__EXEEXT_FALSE$]) -m4trace:configure.ac:218: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE]) -m4trace:configure.ac:218: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE]) -m4trace:configure.ac:218: -1- AC_SUBST_TRACE([top_builddir]) -m4trace:configure.ac:218: -1- AC_SUBST_TRACE([top_build_prefix]) -m4trace:configure.ac:218: -1- AC_SUBST_TRACE([srcdir]) -m4trace:configure.ac:218: -1- AC_SUBST_TRACE([abs_srcdir]) -m4trace:configure.ac:218: -1- AC_SUBST_TRACE([top_srcdir]) -m4trace:configure.ac:218: -1- AC_SUBST_TRACE([abs_top_srcdir]) -m4trace:configure.ac:218: -1- AC_SUBST_TRACE([builddir]) -m4trace:configure.ac:218: -1- AC_SUBST_TRACE([abs_builddir]) -m4trace:configure.ac:218: -1- AC_SUBST_TRACE([abs_top_builddir]) -m4trace:configure.ac:218: -1- AC_SUBST_TRACE([INSTALL]) -m4trace:configure.ac:218: -1- AC_SUBST_TRACE([MKDIR_P]) -m4trace:configure.ac:218: -1- AC_REQUIRE_AUX_FILE([ltmain.sh]) +m4trace:configure.ac:217: -1- AC_SUBST([LIBCRYPTO_LDADD], [$LIBCRYPTO_LDADD]) +m4trace:configure.ac:217: -1- AC_SUBST_TRACE([LIBCRYPTO_LDADD]) +m4trace:configure.ac:217: -1- m4_pattern_allow([^LIBCRYPTO_LDADD$]) +m4trace:configure.ac:218: -1- AC_SUBST([LIBCRYPTO_CFLAGS], [$LIBCRYPTO_CFLAGS]) +m4trace:configure.ac:218: -1- AC_SUBST_TRACE([LIBCRYPTO_CFLAGS]) +m4trace:configure.ac:218: -1- m4_pattern_allow([^LIBCRYPTO_CFLAGS$]) +m4trace:configure.ac:219: -1- AC_SUBST([SHA1_SOURCES], [$SHA1_SOURCES]) +m4trace:configure.ac:219: -1- AC_SUBST_TRACE([SHA1_SOURCES]) +m4trace:configure.ac:219: -1- m4_pattern_allow([^SHA1_SOURCES$]) +m4trace:configure.ac:221: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs]) +m4trace:configure.ac:221: -1- AC_SUBST_TRACE([LIB@&t@OBJS]) +m4trace:configure.ac:221: -1- m4_pattern_allow([^LIB@&t@OBJS$]) +m4trace:configure.ac:221: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs]) +m4trace:configure.ac:221: -1- AC_SUBST_TRACE([LTLIBOBJS]) +m4trace:configure.ac:221: -1- m4_pattern_allow([^LTLIBOBJS$]) +m4trace:configure.ac:221: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"]) +m4trace:configure.ac:221: -1- AC_SUBST([am__EXEEXT_TRUE]) +m4trace:configure.ac:221: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE]) +m4trace:configure.ac:221: -1- m4_pattern_allow([^am__EXEEXT_TRUE$]) +m4trace:configure.ac:221: -1- AC_SUBST([am__EXEEXT_FALSE]) +m4trace:configure.ac:221: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE]) +m4trace:configure.ac:221: -1- m4_pattern_allow([^am__EXEEXT_FALSE$]) +m4trace:configure.ac:221: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE]) +m4trace:configure.ac:221: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE]) +m4trace:configure.ac:221: -1- AC_SUBST_TRACE([top_builddir]) +m4trace:configure.ac:221: -1- AC_SUBST_TRACE([top_build_prefix]) +m4trace:configure.ac:221: -1- AC_SUBST_TRACE([srcdir]) +m4trace:configure.ac:221: -1- AC_SUBST_TRACE([abs_srcdir]) +m4trace:configure.ac:221: -1- AC_SUBST_TRACE([top_srcdir]) +m4trace:configure.ac:221: -1- AC_SUBST_TRACE([abs_top_srcdir]) +m4trace:configure.ac:221: -1- AC_SUBST_TRACE([builddir]) +m4trace:configure.ac:221: -1- AC_SUBST_TRACE([abs_builddir]) +m4trace:configure.ac:221: -1- AC_SUBST_TRACE([abs_top_builddir]) +m4trace:configure.ac:221: -1- AC_SUBST_TRACE([INSTALL]) +m4trace:configure.ac:221: -1- AC_SUBST_TRACE([MKDIR_P]) +m4trace:configure.ac:221: -1- AC_REQUIRE_AUX_FILE([ltmain.sh]) diff --git a/configure b/configure index fc92ebd9..a84a60a5 100755 --- a/configure +++ b/configure @@ -13454,8 +13454,6 @@ if test "x$WITH_FUSE" = "xyes"; then $as_echo "#define WITH_FUSE 1" >>confdefs.h - LIBFUSE_LDADD=`pkg-config --libs fuse` - LIBFUSE_CFLAGS=`pkg-config --cflags fuse` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fuse_main_real in -lfuse" >&5 $as_echo_n "checking for fuse_main_real in -lfuse... " >&6; } @@ -13550,6 +13548,8 @@ else fi + LIBFUSE_LDADD="`pkg-config --libs fuse` -lrt" + LIBFUSE_CFLAGS="`pkg-config --cflags fuse`" else LIBFUSE_LDADD= LIBFUSE_CFLAGS= @@ -13699,8 +13699,11 @@ if test "x$WITH_LIBCRYPTO" = "xyes" -a "x$ENABLE_SSSE3_SHA1" = "xno"; then $as_echo "#define WITH_LIBCRYPTO 1" >>confdefs.h - LIBCRYPTO_LDADD=`pkg-config --libs libcrypto` - LIBCRYPTO_CFLAGS=`pkg-config --cflags libcrypto` + LIBCRYPTO_LDADD=`pkg-config --libs libcrypto 2>/dev/null` + if test $? -ne 0; then + LIBCRYPTO_LDADD=-lcrypto; + fi + LIBCRYPTO_CFLAGS=`pkg-config --cflags libcrypto 2>/dev/null` else LIBCRYPTO_LDADD= LIBCRYPTO_CFLAGS= diff --git a/configure.ac b/configure.ac index a1502ea1..26ff560c 100644 --- a/configure.ac +++ b/configure.ac @@ -142,8 +142,6 @@ AC_MSG_RESULT([$WITH_FUSE]) if test "x$WITH_FUSE" = "xyes"; then AC_DEFINE([WITH_FUSE], [1], [Define to 1 if using FUSE.]) - LIBFUSE_LDADD=`pkg-config --libs fuse` - LIBFUSE_CFLAGS=`pkg-config --cflags fuse` AC_CHECK_LIB([fuse], [fuse_main_real], [have_fuse=true], [AC_MSG_ERROR([Cannot find libfuse. @@ -158,6 +156,8 @@ if test "x$WITH_FUSE" = "xyes"; then version of glibc, or configure with --without-fuse to disable support for mounting WIMs.]) ]) + LIBFUSE_LDADD="`pkg-config --libs fuse` -lrt" + LIBFUSE_CFLAGS="`pkg-config --cflags fuse`" else LIBFUSE_LDADD= LIBFUSE_CFLAGS= @@ -205,8 +205,11 @@ AC_MSG_RESULT([$WITH_LIBCRYPTO]) if test "x$WITH_LIBCRYPTO" = "xyes" -a "x$ENABLE_SSSE3_SHA1" = "xno"; then AC_DEFINE([WITH_LIBCRYPTO], [1], [Define to 1 if using libcrypto SHA1]) - LIBCRYPTO_LDADD=`pkg-config --libs libcrypto` - LIBCRYPTO_CFLAGS=`pkg-config --cflags libcrypto` + LIBCRYPTO_LDADD=`pkg-config --libs libcrypto 2>/dev/null` + if test $? -ne 0; then + LIBCRYPTO_LDADD=-lcrypto; + fi + LIBCRYPTO_CFLAGS=`pkg-config --cflags libcrypto 2>/dev/null` else LIBCRYPTO_LDADD= LIBCRYPTO_CFLAGS=