diff options
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | libmsi/Makefile.am | 6 | ||||
| -rw-r--r-- | libmsi/msipriv.h | 2 |
4 files changed, 13 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index fab14ed..f2f570f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,15 +4,16 @@ SUBDIRS = libmsi . tests noinst_HEADERS = include/debug.h dist_include_HEADERS = include/libmsi.h -AM_CPPFLAGS = -Iinclude -I$(srcdir)/include +AM_CPPFLAGS = -Iinclude -I$(srcdir)/include $(GLIB_CFLAGS) $(GSF_CFLAGS) + AM_LDFLAGS = -Llibmsi bin_PROGRAMS = msibuild msiinfo msibuild_SOURCES = tools/msibuild.c -msibuild_LDADD = -lmsi +msibuild_LDADD = -lmsi $(GLIB_LIBS) $(GSF_LIBS) msibuild_DEPENDENCIES = libmsi/libmsi.la msiinfo_SOURCES = tools/msiinfo.c -msiinfo_LDADD = -lmsi +msiinfo_LDADD = -lmsi $(GLIB_LIBS) $(GSF_LIBS) msiinfo_DEPENDENCIES = libmsi/libmsi.la diff --git a/configure.ac b/configure.ac index fc3caaa..3efd57e 100644 --- a/configure.ac +++ b/configure.ac @@ -15,6 +15,9 @@ AC_USE_SYSTEM_EXTENSIONS AC_PROG_CC AC_PROG_YACC +AM_PATH_GLIB_2_0([2.12.0]) +PKG_CHECK_MODULES([GSF], [libgsf-1]) + LT_INIT([win32-dll disable-fast-install]) AC_CONFIG_FILES([Makefile libmsi/Makefile tests/Makefile]) diff --git a/libmsi/Makefile.am b/libmsi/Makefile.am index ab25759..b336304 100644 --- a/libmsi/Makefile.am +++ b/libmsi/Makefile.am @@ -1,7 +1,8 @@ lib_LTLIBRARIES = libmsi.la AM_CPPFLAGS = -I$(top_srcdir)/include -I$(srcdir) -I. -DUNICODE \ - -I$(srcdir)/winstubs -include $(srcdir)/winstubs/winstubs.h + -I$(srcdir)/winstubs -include $(srcdir)/winstubs/winstubs.h \ + $(GLIB_CFLAGS) $(GSF_CFLAGS) AM_CFLAGS = -Wunused -Wimplicit AM_YFLAGS = -d @@ -23,6 +24,7 @@ libmsi_la_LDFLAGS = -no-undefined -rpath $(libdir) \ -export-symbols-regex='^libmsi_' libmsi_la_LIBADD = \ - $(libmsi_la_DEPENDENCIES) \ + $(GLIB_LIBS) \ + $(GSF_LIBS) \ -lshlwapi \ -lole32 diff --git a/libmsi/msipriv.h b/libmsi/msipriv.h index 32f8d93..9da6429 100644 --- a/libmsi/msipriv.h +++ b/libmsi/msipriv.h @@ -23,6 +23,8 @@ #define __WINE_MSI_PRIVATE__ #include <stdarg.h> +#include <glib.h> +#include <gsf/gsf.h> #include "unicode.h" #include "windef.h" |