diff options
| author | Ted Gould <ted@gould.cx> | 2009-12-31 06:07:45 +0000 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2009-12-31 06:07:45 +0000 |
| commit | f8e1a9f966ea52560102941b26c82f0710a60cd4 (patch) | |
| tree | e720637301ccc928b1c185d5dcf74a68bbe39c92 | |
| parent | Making BUILT_SOURCES an append (diff) | |
| download | inkscape-f8e1a9f966ea52560102941b26c82f0710a60cd4.tar.gz inkscape-f8e1a9f966ea52560102941b26c82f0710a60cd4.zip | |
Setting up a flag for local install for distcheck
(bzr r8254.1.40)
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac | 15 |
2 files changed, 16 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index f07cf6979..fa9640a1d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,6 +16,7 @@ Graphics_DATA = $(Graphics_in_files:.desktop.in=.desktop) ## cp $(srcdir)/AUTHORS $(distdir) ## cp $(srcdir)/NEWS $(distdir) +DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall man_MANS = inkscape.1 \ inkview.1 diff --git a/configure.ac b/configure.ac index 4db84a1d3..6d673ca0d 100644 --- a/configure.ac +++ b/configure.ac @@ -620,12 +620,26 @@ AC_SUBST(LIBWPG_LIBS) AC_SUBST(LIBWPG_CFLAGS) dnl ****************************** +dnl Support doing a local install +dnl (mostly for distcheck) +dnl ****************************** + +with_localinstall="no" +AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall], [install system files in the local path (for distcheck)]), with_localinstall=$enableval, with_localinstall=no) + +dnl ****************************** dnl Check for dbus functionality dnl ****************************** PKG_CHECK_MODULES(DBUS, dbus-glib-1, with_dbus=yes, with_dbus=no) if test "x$with_dbus" = "xyes"; then AC_DEFINE(WITH_DBUS,1,[Build in dbus]) + if test "x$with_localinstall" = "xyes"; then + DBUSSERVICEDIR="${datadir}/dbus-1/services/" + else + DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1` + fi + AC_SUBST(DBUSSERVICEDIR) fi AM_CONDITIONAL(WITH_DBUS, test "x$with_dbus" = "xyes") @@ -1035,4 +1049,5 @@ Configuration: Enable Poppler-Cairo: ${enable_poppler_cairo} ImageMagick Magick++: ${magick_ok} Libwpg: ${with_libwpg} + Doing Local Install: ${with_localinstall} " |