Skip to content

Update autotools files to make the project compile again #212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update autotools files to make the project compile again #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b0fcf0
Update configure file to current autotools of Debian Stable (Bullseye…
Apr 2, 2023
329ac40
Provide a package name to g-ir-scanner to export to the .gir file so …
Apr 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = midgard2.pc

-include $(INTROSPECTION_MAKEFILE)
INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --pkg-export=midgard2
INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)

if HAVE_INTROSPECTION
Expand Down
22 changes: 6 additions & 16 deletions configure.in → configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,11 @@ AC_CONFIG_SRCDIR(src/midgard.c)

dnl Automake is needed for the build system.
dnl
AM_INIT_AUTOMAKE([-Wno-portability -Wall])
AM_PROG_AR
AM_INIT_AUTOMAKE([-Wno-portability -Wall subdir-objects])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AM_MAINTAINER_MODE
GOBJECT_INTROSPECTION_CHECK([0.6.5])
GOBJECT_INTROSPECTION_CHECK([1.66])

AC_PROG_CC(gcc cc)
AC_LANG(C)
Expand All @@ -30,18 +31,10 @@ dnl Checks for programs.
AM_PROG_LIBTOOL

dnl Checks libgda
gdamodule="libgda-4.0"
GDA_GIR_INCLUDE="Gda-4.0"
GDA_GIR_PACKAGE="libgda-4.0"
AC_MSG_CHECKING([whether to use Libgda5 (libgda4 by default)])
AC_ARG_WITH(libgda5, [ --with-libgda5], gdamodule="libgda-5.0", gdamodule="libgda-4.0")
AC_MSG_RESULT($gdamodule)

if test "$gdamodule" == "libgda-5.0"; then
GDA_GIR_INCLUDE="Gda-5.0"
GDA_GIR_PACKAGE="libgda-5.0"
fi

GDA_GIR_INCLUDE="Gda-5.0"
GDA_GIR_PACKAGE="libgda-5.0"
gdamodule="libgda-5.0"

_MIDGARD_DBUS_SUPPORT=yes
dbus_libs="dbus-1 dbus-glib-1"
Expand All @@ -57,9 +50,6 @@ if test "$_MIDGARD_DBUS_SUPPORT" == "no"; then
fi

PKG_CHECK_MODULES(MIDGARD, glib-2.0 gobject-2.0 libxml-2.0 $gdamodule $dbus_libs)
if test "$gdamodule" == "libgda-4.0"; then
MIDGARD_CFLAGS="${MIDGARD_CFLAGS} -DHAVE_LIBGDA_4"
fi

DBUS_CONF_DIR="/etc"
if test "$_MIDGARD_DBUS_SUPPORT" == "yes"; then
Expand Down