X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=configure;h=a84a60a5cb448fe4b783ab436d974edb7e635852;hb=e6a3f1c78efcdc1b4a153b008302145a95f30edc;hp=a7448bd61287c5816fada5335c3290af05790ae9;hpb=885632f08c75c1d7bb5d25436231c78f6ad7e0c0;p=wimlib diff --git a/configure b/configure index a7448bd6..a84a60a5 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for wimlib 0.6.2. +# Generated by GNU Autoconf 2.69 for wimlib 0.6.3. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='wimlib' PACKAGE_TARNAME='wimlib' -PACKAGE_VERSION='0.6.2' -PACKAGE_STRING='wimlib 0.6.2' +PACKAGE_VERSION='0.6.3' +PACKAGE_STRING='wimlib 0.6.3' PACKAGE_BUGREPORT='ebiggers3@gmail.com' PACKAGE_URL='' @@ -646,6 +646,7 @@ LIBFUSE_CFLAGS LIBFUSE_LDADD LIBXML2_CFLAGS LIBXML2_LDADD +pkgconfigdir LTLIBICONV LIBICONV OTOOL64 @@ -769,6 +770,7 @@ with_sysroot enable_libtool_lock enable_rpath with_libiconv_prefix +with_pkgconfigdir enable_debug enable_more_debug enable_error_messages @@ -1328,7 +1330,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures wimlib 0.6.2 to adapt to many kinds of systems. +\`configure' configures wimlib 0.6.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1398,7 +1400,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of wimlib 0.6.2:";; + short | recursive ) echo "Configuration of wimlib 0.6.3:";; esac cat <<\_ACEOF @@ -1442,6 +1444,7 @@ Optional Packages: --with-gnu-ld assume the C compiler uses GNU ld default=no --with-libiconv-prefix[=DIR] search for libiconv in DIR/include and DIR/lib --without-libiconv-prefix don't search for libiconv in includedir and libdir + --with-pkgconfigdir=DIR pkgconfig file in DIR [LIBDIR/pkgconfig] --without-fuse build without libfuse. This will disable the ability to mount WIM files. --without-libcrypto build in the SHA1 algorithm, rather than use @@ -1524,7 +1527,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -wimlib configure 0.6.2 +wimlib configure 0.6.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1802,7 +1805,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by wimlib $as_me 0.6.2, which was +It was created by wimlib $as_me 0.6.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2633,7 +2636,7 @@ fi # Define the identity of the package. PACKAGE='wimlib' - VERSION='0.6.2' + VERSION='0.6.3' cat >>confdefs.h <<_ACEOF @@ -11622,7 +11625,7 @@ CC="$lt_save_CC" ac_config_headers="$ac_config_headers config.h" -ac_config_files="$ac_config_files Makefile doc/Makefile doc/Doxyfile src/Makefile programs/Makefile" +ac_config_files="$ac_config_files Makefile doc/Makefile doc/Doxyfile src/Makefile programs/Makefile wimlib.pc doc/imagex.1 doc/imagex-append.1 doc/imagex-apply.1 doc/imagex-capture.1 doc/imagex-delete.1 doc/imagex-dir.1 doc/imagex-export.1 doc/imagex-info.1 doc/imagex-mount.1 doc/imagex-mountrw.1 doc/imagex-unmount.1 doc/mkwinpeimg.1 rpm/wimlib.spec archlinux/PKGBUILD" ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -12293,6 +12296,7 @@ fi + if test "X$prefix" = "XNONE"; then acl_final_prefix="$ac_default_prefix" else @@ -13264,8 +13268,16 @@ if test "x$am_cv_func_iconv" != "xyes"; then libraries." "$LINENO" 5 fi -LIBXML2_LDADD=`pkg-config libxml-2.0 --libs` -LIBXML2_CFLAGS=`pkg-config libxml-2.0 --cflags` + +# Check whether --with-pkgconfigdir was given. +if test "${with_pkgconfigdir+set}" = set; then : + withval=$with_pkgconfigdir; pkgconfigdir=$withval +else + pkgconfigdir='${libdir}/pkgconfig' +fi + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlParseFile in -lxml2" >&5 $as_echo_n "checking for xmlParseFile in -lxml2... " >&6; } if ${ac_cv_lib_xml2_xmlParseFile+:} false; then : @@ -13308,6 +13320,8 @@ else as_fn_error $? "\"cannot find libxml2\"" "$LINENO" 5 fi +LIBXML2_LDADD=`pkg-config libxml-2.0 --libs` +LIBXML2_CFLAGS=`pkg-config libxml-2.0 --cflags` LIBXML2_LDADD=$LIBXML2_LDADD LIBXML2_CFLAGS=$LIBXML2_CFLAGS @@ -13440,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; } @@ -13536,6 +13548,8 @@ else fi + LIBFUSE_LDADD="`pkg-config --libs fuse` -lrt" + LIBFUSE_CFLAGS="`pkg-config --cflags fuse`" else LIBFUSE_LDADD= LIBFUSE_CFLAGS= @@ -13685,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= @@ -14233,7 +14250,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by wimlib $as_me 0.6.2, which was +This file was extended by wimlib $as_me 0.6.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14299,7 +14316,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -wimlib config.status 0.6.2 +wimlib config.status 0.6.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -14713,6 +14730,21 @@ do "doc/Doxyfile") CONFIG_FILES="$CONFIG_FILES doc/Doxyfile" ;; "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "programs/Makefile") CONFIG_FILES="$CONFIG_FILES programs/Makefile" ;; + "wimlib.pc") CONFIG_FILES="$CONFIG_FILES wimlib.pc" ;; + "doc/imagex.1") CONFIG_FILES="$CONFIG_FILES doc/imagex.1" ;; + "doc/imagex-append.1") CONFIG_FILES="$CONFIG_FILES doc/imagex-append.1" ;; + "doc/imagex-apply.1") CONFIG_FILES="$CONFIG_FILES doc/imagex-apply.1" ;; + "doc/imagex-capture.1") CONFIG_FILES="$CONFIG_FILES doc/imagex-capture.1" ;; + "doc/imagex-delete.1") CONFIG_FILES="$CONFIG_FILES doc/imagex-delete.1" ;; + "doc/imagex-dir.1") CONFIG_FILES="$CONFIG_FILES doc/imagex-dir.1" ;; + "doc/imagex-export.1") CONFIG_FILES="$CONFIG_FILES doc/imagex-export.1" ;; + "doc/imagex-info.1") CONFIG_FILES="$CONFIG_FILES doc/imagex-info.1" ;; + "doc/imagex-mount.1") CONFIG_FILES="$CONFIG_FILES doc/imagex-mount.1" ;; + "doc/imagex-mountrw.1") CONFIG_FILES="$CONFIG_FILES doc/imagex-mountrw.1" ;; + "doc/imagex-unmount.1") CONFIG_FILES="$CONFIG_FILES doc/imagex-unmount.1" ;; + "doc/mkwinpeimg.1") CONFIG_FILES="$CONFIG_FILES doc/mkwinpeimg.1" ;; + "rpm/wimlib.spec") CONFIG_FILES="$CONFIG_FILES rpm/wimlib.spec" ;; + "archlinux/PKGBUILD") CONFIG_FILES="$CONFIG_FILES archlinux/PKGBUILD" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac