diff options
Diffstat (limited to 'devel/gvfs/files/patch-configure')
| -rw-r--r-- | devel/gvfs/files/patch-configure | 128 |
1 files changed, 101 insertions, 27 deletions
diff --git a/devel/gvfs/files/patch-configure b/devel/gvfs/files/patch-configure index a2b691355797..efc346b66ed4 100644 --- a/devel/gvfs/files/patch-configure +++ b/devel/gvfs/files/patch-configure @@ -1,29 +1,103 @@ ---- configure.orig 2010-05-28 10:24:40.000000000 +0200 -+++ configure 2010-05-28 10:25:59.000000000 +0200 -@@ -16253,7 +16253,7 @@ - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-larchive $LIBS" -+LIBS="-larchive -lcrypto -lmd $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ +--- configure.orig 2014-01-17 19:42:49.000000000 +0100 ++++ configure 2014-01-17 19:43:03.000000000 +0100 +@@ -17233,6 +17233,100 @@ -@@ -16298,7 +16298,7 @@ - if test x$with_archive_libs != x/usr/lib; then - ARCHIVE_LIBS="-L$with_archive_libs -larchive" - else -- ARCHIVE_LIBS="-larchive" -+ ARCHIVE_LIBS="-larchive -lcrypto -lmd" - fi - else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for archive_entry_filetype in -larchive" >&5 -@@ -16307,7 +16307,7 @@ - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-larchive $LIBS" -+LIBS="-larchive -lcrypto -lmd $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ + $as_echo "#define HAVE_GPHOTO2 1" >>confdefs.h ++ ++pkg_failed=no ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GPHOTO2" >&5 ++$as_echo_n "checking for GPHOTO2... " >&6; } ++ ++if test -n "$GPHOTO2_CFLAGS"; then ++ pkg_cv_GPHOTO2_CFLAGS="$GPHOTO2_CFLAGS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgphoto2 >= 2.5.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libgphoto2 >= 2.5.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_GPHOTO2_CFLAGS=`$PKG_CONFIG --cflags "libgphoto2 >= 2.5.0" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++if test -n "$GPHOTO2_LIBS"; then ++ pkg_cv_GPHOTO2_LIBS="$GPHOTO2_LIBS" ++ elif test -n "$PKG_CONFIG"; then ++ if test -n "$PKG_CONFIG" && \ ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgphoto2 >= 2.5.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libgphoto2 >= 2.5.0") 2>&5 ++ ac_status=$? ++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 ++ test $ac_status = 0; }; then ++ pkg_cv_GPHOTO2_LIBS=`$PKG_CONFIG --libs "libgphoto2 >= 2.5.0" 2>/dev/null` ++ test "x$?" != "x0" && pkg_failed=yes ++else ++ pkg_failed=yes ++fi ++ else ++ pkg_failed=untried ++fi ++ ++ ++ ++if test $pkg_failed = yes; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ ++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then ++ _pkg_short_errors_supported=yes ++else ++ _pkg_short_errors_supported=no ++fi ++ if test $_pkg_short_errors_supported = yes; then ++ GPHOTO2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libgphoto2 >= 2.5.0" 2>&1` ++ else ++ GPHOTO2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libgphoto2 >= 2.5.0" 2>&1` ++ fi ++ # Put the nasty error message in config.log where it belongs ++ echo "$GPHOTO2_PKG_ERRORS" >&5 ++ ++ as_fn_error $? "Package requirements (libgphoto2 >= 2.5.0) were not met: ++ ++$GPHOTO2_PKG_ERRORS ++ ++Consider adjusting the PKG_CONFIG_PATH environment variable if you ++installed software in a non-standard prefix. ++ ++Alternatively, you may set the environment variables GPHOTO2_CFLAGS ++and GPHOTO2_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details." "$LINENO" 5 ++elif test $pkg_failed = untried; then ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 ++$as_echo "no" >&6; } ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 ++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ++as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it ++is in your PATH or set the PKG_CONFIG environment variable to the full ++path to pkg-config. ++ ++Alternatively, you may set the environment variables GPHOTO2_CFLAGS ++and GPHOTO2_LIBS to avoid the need to call pkg-config. ++See the pkg-config man page for more details. ++ ++To get pkg-config, see <http://pkg-config.freedesktop.org/>. ++See \`config.log' for more details" "$LINENO" 5; } ++else ++ GPHOTO2_CFLAGS=$pkg_cv_GPHOTO2_CFLAGS ++ GPHOTO2_LIBS=$pkg_cv_GPHOTO2_LIBS ++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 ++$as_echo "yes" >&6; } ++ ++$as_echo "#define HAVE_GPHOTO25 1" >>confdefs.h ++ ++ ++fi + else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Not building with gphoto2 support. Need OS tweaks in hal volume monitor." >&5 + $as_echo "$as_me: WARNING: Not building with gphoto2 support. Need OS tweaks in hal volume monitor." >&2;} |