Disable use of wxSecretStore with wxGTK1

libsecret is for GTK+ 2+ only and can't be used with GTK+ 1.
This commit is contained in:
Vadim Zeitlin
2018-07-09 00:24:35 +02:00
parent a74058a958
commit 2034f6683b
2 changed files with 10 additions and 15 deletions

20
configure vendored
View File

@@ -1040,7 +1040,6 @@ infodir
docdir docdir
oldincludedir oldincludedir
includedir includedir
runstatedir
localstatedir localstatedir
sharedstatedir sharedstatedir
sysconfdir sysconfdir
@@ -1461,7 +1460,6 @@ datadir='${datarootdir}'
sysconfdir='${prefix}/etc' sysconfdir='${prefix}/etc'
sharedstatedir='${prefix}/com' sharedstatedir='${prefix}/com'
localstatedir='${prefix}/var' localstatedir='${prefix}/var'
runstatedir='${localstatedir}/run'
includedir='${prefix}/include' includedir='${prefix}/include'
oldincludedir='/usr/include' oldincludedir='/usr/include'
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1714,15 +1712,6 @@ do
| -silent | --silent | --silen | --sile | --sil) | -silent | --silent | --silen | --sile | --sil)
silent=yes ;; silent=yes ;;
-runstatedir | --runstatedir | --runstatedi | --runstated \
| --runstate | --runstat | --runsta | --runst | --runs \
| --run | --ru | --r)
ac_prev=runstatedir ;;
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
| --run=* | --ru=* | --r=*)
runstatedir=$ac_optarg ;;
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
ac_prev=sbindir ;; ac_prev=sbindir ;;
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1860,7 +1849,7 @@ fi
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \ datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
libdir localedir mandir runstatedir libdir localedir mandir
do do
eval ac_val=\$$ac_var eval ac_val=\$$ac_var
# Remove trailing slashes. # Remove trailing slashes.
@@ -2013,7 +2002,6 @@ Fine tuning of the installation directories:
--sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var] --localstatedir=DIR modifiable single-machine data [PREFIX/var]
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib] --libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include] --includedir=DIR C header files [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc [/usr/include] --oldincludedir=DIR C header files for non-gcc [/usr/include]
@@ -34150,7 +34138,11 @@ fi
if test "$wxUSE_SECRETSTORE" = "yes"; then if test "$wxUSE_SECRETSTORE" = "yes"; then
if test "$wxUSE_MSW" != "1" -a "$wxUSE_OSX_COCOA" != 1; then if test "$WXGTK1" = "1"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libsecret is incompatible with GTK+ 1, disabled" >&5
$as_echo "$as_me: WARNING: libsecret is incompatible with GTK+ 1, disabled" >&2;}
wxUSE_SECRETSTORE=no
elif test "$wxUSE_MSW" != "1" -a "$wxUSE_OSX_COCOA" != 1; then
pkg_failed=no pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBSECRET" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBSECRET" >&5

View File

@@ -5419,7 +5419,10 @@ dnl ---------------------------------------------------------------------------
if test "$wxUSE_SECRETSTORE" = "yes"; then if test "$wxUSE_SECRETSTORE" = "yes"; then
dnl The required APIs are always available under MSW and OS X but we must dnl The required APIs are always available under MSW and OS X but we must
dnl have GNOME libsecret under Unix to be able to compile this class. dnl have GNOME libsecret under Unix to be able to compile this class.
if test "$wxUSE_MSW" != "1" -a "$wxUSE_OSX_COCOA" != 1; then if test "$WXGTK1" = "1"; then
AC_MSG_WARN([libsecret is incompatible with GTK+ 1, disabled])
wxUSE_SECRETSTORE=no
elif test "$wxUSE_MSW" != "1" -a "$wxUSE_OSX_COCOA" != 1; then
PKG_CHECK_MODULES(LIBSECRET, [libsecret-1], PKG_CHECK_MODULES(LIBSECRET, [libsecret-1],
[ [
CXXFLAGS="$LIBSECRET_CFLAGS $CXXFLAGS" CXXFLAGS="$LIBSECRET_CFLAGS $CXXFLAGS"