diff options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index 0c29311eb..ab533e67a 100644 --- a/configure.ac +++ b/configure.ac @@ -529,12 +529,13 @@ yes ) #error Berkeley DB too old #endif ]) - ],[ WITH_DB_LIB=-ldb ], + ],[ WITH_DB_LIB=-ldb ], [ AC_MSG_ERROR([Berkeley DB version >= 4.5 required]) ]) ],[ AC_MSG_ERROR([missing required header db.h]) ]) + AC_DEFINE(WITH_EXTERNAL_DB, 1, [Use external db?]) ;; no|maybe ) # Try internal database first, then fall back to external @@ -802,7 +803,7 @@ esac], WITH_PYTHON_SUBPACKAGE=0 AS_IF([test "$enable_python" = yes],[ - AM_PATH_PYTHON([2.6],[ + AM_PATH_PYTHON([3.2],[ PKG_CHECK_MODULES([PYTHON], [python-${PYTHON_VERSION}], [WITH_PYTHON_SUBPACKAGE=1]) AC_SUBST(PYTHON_CFLAGS) AC_SUBST(PYTHON_LIB) @@ -1023,9 +1024,12 @@ AC_ARG_WITH([lua], [AS_HELP_STRING([--with-lua], [build with lua support])], [], [with_lua=yes]) +if test X"$LUA_PKGCONFIG_NAME" = X ; then + LUA_PKGCONFIG_NAME=lua +fi AS_IF([test "$with_lua" != no],[ PKG_CHECK_MODULES([LUA], - [lua >= 5.1], + [${LUA_PKGCONFIG_NAME} >= 5.1], [AC_DEFINE(WITH_LUA, 1, [Build with lua support?])], [AC_MSG_ERROR([lua not present (--without-lua to disable)])]) AC_SUBST(LUA_CFLAGS) @@ -1151,8 +1155,7 @@ AC_ARG_WITH([rpmconfigdir], [AS_HELP_STRING([--with-rpmconfigdir], [Set up rpm config not into /usr/lib/rpm @<:@default=check@:>@])], [RPMCONFIGDIR=$withval], - [RPMCONFIGDIR="`echo ${usrprefix}/lib/rpm`"]) - + [RPMCONFIGDIR="`echo ${libdir}/rpm`"]) AC_SUBST(RPMCONFIGDIR) AC_SUBST(OBJDUMP) @@ -1165,6 +1168,13 @@ AM_CONDITIONAL([WITH_INTERNAL_DB],[test "$with_external_db" = no]) AM_CONDITIONAL([DOXYGEN],[test "$DOXYGEN" != no]) AM_CONDITIONAL([HACKINGDOCS],[test "$with_hackingdocs" = yes]) +AC_ARG_VAR([PYTHON_MODULENAME], [Name of the rpm python module. Defaults to 'rpm']) +if test X"$PYTHON_MODULENAME" = X ; then + PYTHON_MODULENAME="$PACKAGE" +fi +AC_DEFINE_UNQUOTED(PYTHON_MODULENAME, ["$PYTHON_MODULENAME"],[python module name]) +AC_SUBST(PYTHON_MODULENAME) + AC_PATH_PROG(AUTOM4TE,autom4te,:) AC_SUBST([dirstamp],[\${am__leading_dot}dirstamp]) @@ -1172,9 +1182,11 @@ AC_SUBST([dirstamp],[\${am__leading_dot}dirstamp]) AC_CONFIG_FILES([Makefile rpmio/Makefile lib/Makefile build/Makefile sign/Makefile po/Makefile.in scripts/Makefile fileattrs/Makefile - misc/Makefile + misc/Makefile doc/Makefile python/Makefile + python/rpm/__init__.py + python/rpm/transaction.py luaext/Makefile tests/Makefile plugins/Makefile |