diff options
| author | Stefano Karapetsas <[email protected]> | 2014-01-13 05:57:20 -0800 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2014-01-13 05:57:20 -0800 |
| commit | 342daa42359da5edb023cbd6bb6afd4fd63a088c (patch) | |
| tree | 08f23ffbaab794432dcb18d5bdc554d37e495db3 /configure.ac | |
| parent | 276b5f84da52084c31321cb363f90e2de55242e0 (diff) | |
| parent | 0ce31a551ded5d0e03a7309a0cfcb38add3d203a (diff) | |
| download | python-caja-342daa42359da5edb023cbd6bb6afd4fd63a088c.tar.bz2 python-caja-342daa42359da5edb023cbd6bb6afd4fd63a088c.tar.xz | |
Merge pull request #12 from infirit/master
Revert "Do not dlopen libpython" + various fixes and cleanups
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 9c80db0..0f1d737 100644 --- a/configure.ac +++ b/configure.ac @@ -1,14 +1,14 @@ -AC_INIT([caja-python], [1.6.0], [http://mate-desktop.org]) +AC_INIT([python-caja], [1.6.0], + [https://github.com/mate-desktop/python-caja/issues], + [python-caja], [http://mate-desktop.org]) AC_SUBST(PACKAGE) AC_SUBST(VERSION) -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE(1.10 dist-xz no-dist-gzip) AC_CONFIG_HEADERS(config.h) AC_CONFIG_MACRO_DIR([m4]) -AC_SUBST(ACLOCAL_AMFLAGS, "-I m4 -I .") - CAJA_REQUIRED=1.6.0 AC_PROG_CC @@ -19,15 +19,13 @@ dnl Check for pkgconfig first AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no) AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -dnl Check for gtk-doc -GTK_DOC_CHECK(1.9) - -dnl Give error and exit if we dont have pkgconfig +dnl Give error and exit if we don't have pkgconfig if test "x$HAVE_PKGCONFIG" = "xno"; then AC_MSG_ERROR([you need to have pkgconfig installed !]) fi -AC_PREFIX_DEFAULT([$(pkg-config --variable=prefix libcaja-extension || echo /usr)]) +dnl Check for gtk-doc +GTK_DOC_CHECK(1.9) dnl ************************************************** dnl * Check for Python @@ -71,9 +69,16 @@ AC_DEFINE_UNQUOTED(CAJA_LIBDIR, "$CAJA_LIBDIR", [Caja libdir]) dnl --------------------------------- dnl Get caja extensions directory dnl --------------------------------- -CAJA_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libcaja-extension` -AC_SUBST(CAJA_EXTENSION_DIR) -AC_DEFINE_UNQUOTED(CAJA_EXTENSION_DIR, "$CAJA_EXTENSION_DIR", [Caja extensions directory]) +AC_ARG_WITH(cajadir, + AS_HELP_STRING([--with-cajadir=DIR],[Installation path for Caja extension @<:@auto@:>@]), + [ac_with_cajadir=$withval], + [ac_with_cajadir=""]) +if test "${ac_with_cajadir}" = ""; then + ac_with_cajadir=`$PKG_CONFIG --variable=extensiondir libcaja-extension` +fi + +AC_MSG_NOTICE([installing caja plugin in ${ac_with_cajadir}]) +AC_SUBST([CAJA_EXTENSION_DIR], [${ac_with_cajadir}]) dnl --------------------------------- dnl Check for gtk-doc dependencies |