add check whether built package can be installed; fixed typo in debian development dependencie
This commit is contained in:
+31
-18
@@ -218,8 +218,17 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
|
||||
AX_SUBST(AUTHOR_URL)
|
||||
AX_SUBST(AUTHOR_MAIL)
|
||||
AX_SUBST(PACKAGER)
|
||||
PROJECT_URL="${PROJECT_URL:-${AUTHOR_URL}/projects/${PACKAGE_NAME}}"
|
||||
SOURCE_DOWNLOAD="${SOURCE_DOWNLOAD:-${AUTHOR_URL}/downloads/${PACKAGE_NAME}}"
|
||||
PROJECT_URL="${PROJECT_URL:-${AUTHOR_URL}}"
|
||||
for path in . .. ../.. ../../..; do
|
||||
if test -d ${path}/.svn; then
|
||||
PROJECT_URL="$(LANG= svn info | sed -n 's,^Repository Root: ,,p')"
|
||||
break
|
||||
elif test -d ${path}/.git; then
|
||||
PROJECT_URL="$(git remote get-url origin)"
|
||||
break
|
||||
fi
|
||||
done
|
||||
SOURCE_DOWNLOAD="${SOURCE_DOWNLOAD:-${PROJECT_URL}}"
|
||||
AX_SUBST(PROJECT_URL)
|
||||
AX_SUBST(SOURCE_DOWNLOAD)
|
||||
VENDOR=$((lsb_release -is 2>/dev/null || echo unknown) | tr ' ' '_')
|
||||
@@ -365,12 +374,13 @@ AC_DEFUN([AX_USE_CXX], [
|
||||
#### Begin: Appended by $0
|
||||
%.app: %
|
||||
-rm -r [\$][@]
|
||||
\$(MAKE) DESTDIR=[\$][\$](pwd)/[\$][@]/tmp install
|
||||
\$(MAKE) DESTDIR=[\$][\$](pwd)/tmp install
|
||||
QTDIR="\${QTDIR}" \
|
||||
QT_PLUGINS="\${QT_PLUGINS}" \
|
||||
QT_PLUGIN_PATH="\${QT_PLUGIN_PATH}" \
|
||||
\${top_builddir}/mac-create-app-bundle.sh \
|
||||
[\$][@] [\$][<] [\$][\$](pwd)/[\$][@]/tmp\${prefix}
|
||||
[\$][@] [\$][<] [\$][\$](pwd)/tmp[\$]{prefix}
|
||||
-rm -rf tmp
|
||||
|
||||
maintainer-clean-cxx-targets:
|
||||
-rm makefile.in
|
||||
@@ -857,7 +867,7 @@ AC_DEFUN([AX_PKG_REQUIRE], [
|
||||
DEV_DIST_PKG=
|
||||
pkg=m4_default([$2], [$1])
|
||||
$6
|
||||
dep_pkg=${DEV_DEB_DIST_PKG:-${DEV_DIST_PKG:-${pkg}}-dev}
|
||||
deb_pkg=${DEV_DEB_DIST_PKG:-${DEV_DIST_PKG:-${pkg}}-dev}
|
||||
rpm_pkg=${DEV_RPM_DIST_PKG:-${DEV_DIST_PKG:-${pkg}}-devel}
|
||||
if test -n "$4"; then
|
||||
for f in $pkg $4; do
|
||||
@@ -1082,24 +1092,21 @@ AC_DEFUN([AX_DEB_DEPEND_IFEXISTS], [
|
||||
# - parameter:
|
||||
# $1 = package name
|
||||
AC_DEFUN([AX_DEB_BUILD_DEPEND], [
|
||||
pkg="$1"
|
||||
DEB_BUILD_DEPEND="${DEB_BUILD_DEPEND}, ${pkg}"
|
||||
DEB_BUILD_DEPEND="${DEB_BUILD_DEPEND}, $1"
|
||||
])
|
||||
|
||||
# require package in debian/control.in append @DEB_DEPEND@ to Depends
|
||||
# - parameter:
|
||||
# $1 = package name
|
||||
AC_DEFUN([AX_DEB_DEPEND], [
|
||||
pkg="$1"
|
||||
DEB_DEPEND="${DEB_DEPEND}, ${pkg}"
|
||||
DEB_DEPEND="${DEB_DEPEND}, $1"
|
||||
])
|
||||
|
||||
# require package in debian/control.in append @DEB_DEPEND@ to Depends
|
||||
# - parameter:
|
||||
# $1 = package name
|
||||
AC_DEFUN([AX_DEB_SECTION], [
|
||||
pkg="$1"
|
||||
DEB_SECTION="${pkg}"
|
||||
DEB_SECTION="$1"
|
||||
])
|
||||
|
||||
# call after setting debian dependencies
|
||||
@@ -1131,19 +1138,17 @@ AC_DEFUN([AX_RPM_DEPEND_IFEXISTS], [
|
||||
# - parameter:
|
||||
# $1 = package name
|
||||
AC_DEFUN([AX_RPM_BUILD_DEPEND], [
|
||||
pkg="$1"
|
||||
RPM_BUILD_DEPEND="${RPM_BUILD_DEPEND}, ${pkg}"
|
||||
RPM_BUILD_DEPEND="${RPM_BUILD_DEPEND}, $1"
|
||||
])
|
||||
|
||||
# require package in .spec.in append @RPM_DEPEND@ to Depends
|
||||
# - parameter:
|
||||
# $1 = package name
|
||||
AC_DEFUN([AX_RPM_DEPEND], [
|
||||
pkg="$1"
|
||||
if test -z "${RPM_DEPEND}"; then
|
||||
RPM_DEPEND="${pkg}"
|
||||
RPM_DEPEND="$1"
|
||||
else
|
||||
RPM_DEPEND="${RPM_DEPEND}, ${pkg}"
|
||||
RPM_DEPEND="${RPM_DEPEND}, $1"
|
||||
fi
|
||||
])
|
||||
|
||||
@@ -1151,8 +1156,7 @@ AC_DEFUN([AX_RPM_DEPEND], [
|
||||
# - parameter:
|
||||
# $1 = package name
|
||||
AC_DEFUN([AX_RPM_GROUP], [
|
||||
pkg="$1"
|
||||
RPM_GROUP="${pkg}"
|
||||
RPM_GROUP="$1"
|
||||
])
|
||||
|
||||
# call after setting rpmian dependencies
|
||||
@@ -1193,6 +1197,15 @@ AC_DEFUN([AX_ALL_BUILD_DEPEND], [
|
||||
RPM_BUILD_DEPEND="${RPM_BUILD_DEPEND}, ${pkg}"
|
||||
])
|
||||
|
||||
# require package in .spec.in and control.in, append to runtime depends
|
||||
# - parameter:
|
||||
# $1 = package name
|
||||
AC_DEFUN([AX_ALL_DEPEND], [
|
||||
pkg="$1"
|
||||
DEB_DEPEND="${DEB_DEPEND}, ${pkg}"
|
||||
RPM_DEPEND="${RPM_DEPEND}, ${pkg}"
|
||||
])
|
||||
|
||||
# require package in .spec.in append @ALL_BUILD_DEPEND@ to Build-Depends
|
||||
# - parameter:
|
||||
# $1 = package name
|
||||
|
||||
Reference in New Issue
Block a user