diff -r 6ae203c8b28d -r 2947214c450e configure.ac --- a/configure.ac Tue Jun 29 10:08:58 2021 +0100 +++ b/configure.ac Tue Apr 25 17:41:00 2023 +0100 @@ -65,9 +65,9 @@ # increment CURRENT and set AGE and REVISION to 0. # - If the interface is the same as the previous version, increment REVISION. # -lt_current=5 +lt_current=6 lt_revision=0 -lt_age=2 +lt_age=3 LIBPLOVER_LT_VERSION_INFO="$lt_current:$lt_revision:$lt_age" AC_SUBST(LIBPLOVER_LT_VERSION_INFO) @@ -142,8 +142,10 @@ PKG_CHECK_MODULES(GMODULE_EXPORT,[gmodule-export-2.0]) LIBPLOVER_CFLAGS="$RAZOR_CFLAGS $EXPAT_CFLAGS $ZLIB_CFLAGS $GIO_CFLAGS" LIBPLOVER_LIBS="$RAZOR_LIBS $EXPAT_LIBS $ZLIB_LIBS $GIO_LIBS" +LIBPLOVER_REQUIREMENTS="razor expat zlib glib2" AC_SUBST(LIBPLOVER_CFLAGS) AC_SUBST(LIBPLOVER_LIBS) +AC_SUBST(LIBPLOVER_REQUIREMENTS) PLOVER_GTK_CFLAGS="$GTK_CFLAGS $RAZOR_CFLAGS" PLOVER_GTK_LIBS="$GTK_LIBS $RAZOR_LIBS" AC_SUBST(PLOVER_GTK_CFLAGS) @@ -155,12 +157,6 @@ LIBS="$save_LIBS" AC_SUBST(LUA_POSIX_CFLAGS) AC_SUBST(LUA_POSIX_LIBS) -GUI_CFLAGS="$GMODULE_EXPORT_CFLAGS $WHELK_CFLAGS $PLOVER_GTK_CFLAGS \ - $LIBPLOVER_CFLAGS $LUA_POSIX_CFLAGS" -GUI_LIBS="$GMODULE_EXPORT_LIBS $WHELK_LIBS $PLOVER_GTK_LIBS \ - $LIBPLOVER_LIBS $LUA_POSIX_LIBS" -AC_SUBST(GUI_CFLAGS) -AC_SUBST(GUI_LIBS) save_PKG_CONFIG="$PKG_CONFIG" PKG_CONFIG="$PKG_CONFIG --static" PKG_CHECK_MODULES(SETUP,[whelk razor >= 0.5.4 expat >= 2.2 zlib gio-2.0],[:], @@ -201,13 +197,28 @@ [have_breakpad="yes";REQUIREMENTS="$REQUIREMENTS x11"],[have_breakpad="no"]) if test "$have_breakpad" = yes; then AC_DEFINE([HAVE_BREAKPAD],[1],[Define if breakpad is available.]) + LIBPLOVER_PRIVATE_REQUIREMENTS="breakpad-client" + # breakpad-client uses C++. This should probably go into + # Libs.private in breakpad-client.pc + AS_IF([test -n "$host_mingw"],[ + static_stdcxx=`$CXX --print-file-name=libstdc++.a` + LIBPLOVER_PRIVATE_LIBS="-lversion -lgcc_eh $static_stdcxx" + ]) elif test "$with_breakpad" = yes; then AC_MSG_ERROR([$BREAKPAD_PKG_ERRORS]) fi else have_breakpad="no" fi +AC_SUBST(LIBPLOVER_PRIVATE_REQUIREMENTS) +AC_SUBST(LIBPLOVER_PRIVATE_LIBS) AM_CONDITIONAL([HAVE_BREAKPAD],[test $have_breakpad = yes]) +GUI_CFLAGS="$GMODULE_EXPORT_CFLAGS $WHELK_CFLAGS $PLOVER_GTK_CFLAGS \ + $LIBPLOVER_CFLAGS $LUA_POSIX_CFLAGS" +GUI_LIBS="$GMODULE_EXPORT_LIBS $WHELK_LIBS $PLOVER_GTK_LIBS \ + $LIBPLOVER_LIBS $LIBPLOVER_PRIVATE_LIBS $LUA_POSIX_LIBS" +AC_SUBST(GUI_CFLAGS) +AC_SUBST(GUI_LIBS) ################################################## # Checks for library functions.