1.1 --- a/configure.ac	Tue Jun 29 10:08:58 2021 +0100
     1.2 +++ b/configure.ac	Tue Apr 25 17:41:00 2023 +0100
     1.3 @@ -65,9 +65,9 @@
     1.4  #   increment CURRENT and set AGE and REVISION to 0.
     1.5  # - If the interface is the same as the previous version, increment REVISION.
     1.6  #
     1.7 -lt_current=5
     1.8 +lt_current=6
     1.9  lt_revision=0
    1.10 -lt_age=2
    1.11 +lt_age=3
    1.12  LIBPLOVER_LT_VERSION_INFO="$lt_current:$lt_revision:$lt_age"
    1.13  AC_SUBST(LIBPLOVER_LT_VERSION_INFO)
    1.14  
    1.15 @@ -142,8 +142,10 @@
    1.16  PKG_CHECK_MODULES(GMODULE_EXPORT,[gmodule-export-2.0])
    1.17  LIBPLOVER_CFLAGS="$RAZOR_CFLAGS $EXPAT_CFLAGS $ZLIB_CFLAGS $GIO_CFLAGS"
    1.18  LIBPLOVER_LIBS="$RAZOR_LIBS $EXPAT_LIBS $ZLIB_LIBS $GIO_LIBS"
    1.19 +LIBPLOVER_REQUIREMENTS="razor expat zlib glib2"
    1.20  AC_SUBST(LIBPLOVER_CFLAGS)
    1.21  AC_SUBST(LIBPLOVER_LIBS)
    1.22 +AC_SUBST(LIBPLOVER_REQUIREMENTS)
    1.23  PLOVER_GTK_CFLAGS="$GTK_CFLAGS $RAZOR_CFLAGS"
    1.24  PLOVER_GTK_LIBS="$GTK_LIBS $RAZOR_LIBS"
    1.25  AC_SUBST(PLOVER_GTK_CFLAGS)
    1.26 @@ -155,12 +157,6 @@
    1.27  LIBS="$save_LIBS"
    1.28  AC_SUBST(LUA_POSIX_CFLAGS)
    1.29  AC_SUBST(LUA_POSIX_LIBS)
    1.30 -GUI_CFLAGS="$GMODULE_EXPORT_CFLAGS $WHELK_CFLAGS $PLOVER_GTK_CFLAGS \
    1.31 -  $LIBPLOVER_CFLAGS $LUA_POSIX_CFLAGS"
    1.32 -GUI_LIBS="$GMODULE_EXPORT_LIBS $WHELK_LIBS $PLOVER_GTK_LIBS \
    1.33 -  $LIBPLOVER_LIBS $LUA_POSIX_LIBS"
    1.34 -AC_SUBST(GUI_CFLAGS)
    1.35 -AC_SUBST(GUI_LIBS)
    1.36  save_PKG_CONFIG="$PKG_CONFIG"
    1.37  PKG_CONFIG="$PKG_CONFIG --static"
    1.38  PKG_CHECK_MODULES(SETUP,[whelk razor >= 0.5.4 expat >= 2.2 zlib gio-2.0],[:],
    1.39 @@ -201,13 +197,28 @@
    1.40        [have_breakpad="yes";REQUIREMENTS="$REQUIREMENTS x11"],[have_breakpad="no"])
    1.41      if test "$have_breakpad" = yes; then
    1.42  	AC_DEFINE([HAVE_BREAKPAD],[1],[Define if breakpad is available.])
    1.43 +	LIBPLOVER_PRIVATE_REQUIREMENTS="breakpad-client"
    1.44 +	# breakpad-client uses C++. This should probably go into
    1.45 +	# Libs.private in breakpad-client.pc
    1.46 +	AS_IF([test -n "$host_mingw"],[
    1.47 +	    static_stdcxx=`$CXX --print-file-name=libstdc++.a`
    1.48 +	    LIBPLOVER_PRIVATE_LIBS="-lversion -lgcc_eh $static_stdcxx"
    1.49 +	])
    1.50      elif test "$with_breakpad" = yes; then
    1.51  	AC_MSG_ERROR([$BREAKPAD_PKG_ERRORS])
    1.52      fi
    1.53  else
    1.54      have_breakpad="no"
    1.55  fi
    1.56 +AC_SUBST(LIBPLOVER_PRIVATE_REQUIREMENTS)
    1.57 +AC_SUBST(LIBPLOVER_PRIVATE_LIBS)
    1.58  AM_CONDITIONAL([HAVE_BREAKPAD],[test $have_breakpad = yes])
    1.59 +GUI_CFLAGS="$GMODULE_EXPORT_CFLAGS $WHELK_CFLAGS $PLOVER_GTK_CFLAGS \
    1.60 +  $LIBPLOVER_CFLAGS $LUA_POSIX_CFLAGS"
    1.61 +GUI_LIBS="$GMODULE_EXPORT_LIBS $WHELK_LIBS $PLOVER_GTK_LIBS \
    1.62 +  $LIBPLOVER_LIBS $LIBPLOVER_PRIVATE_LIBS $LUA_POSIX_LIBS"
    1.63 +AC_SUBST(GUI_CFLAGS)
    1.64 +AC_SUBST(GUI_LIBS)
    1.65  
    1.66  ##################################################
    1.67  # Checks for library functions.