colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "build: don't require intltool unless --with-polkit=yes"

Browse Source 
This reverts commit 0299cf51c4.
This commit is contained in:
Dan Williams
2011-04-27 14:47:00 -05:00
parent 383bf8c9a3
commit c96db0c91b
2 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
autogen.sh
View File

@@ -13,19 +13,9 @@ PKG_NAME=ModemManager
exit 1 exit 1
} }
polkit="false"
args=""
while (( "$#" )); do
if [ "$1" == "--with-polkit=yes" ]; then
polkit="true"
fi
args="$args $1"
shift
done
(cd $srcdir; (cd $srcdir;
autoreconf --install --symlink && autoreconf --install --symlink &&
((eval "$polkit" && intltoolize --force) || true) && intltoolize --force &&
autoreconf && autoreconf &&
./configure --enable-maintainer-mode $args ./configure --enable-maintainer-mode $@
) )

11
configure.ac
View File

@@ -21,9 +21,14 @@ dnl Initialize libtool
LT_PREREQ([2.2]) LT_PREREQ([2.2])
LT_INIT LT_INIT
dnl
dnl translation support
dnl
GETTEXT_PACKAGE=ModemManager GETTEXT_PACKAGE=ModemManager
AC_SUBST(GETTEXT_PACKAGE) AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package]) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
IT_PROG_INTLTOOL([0.35.0])
AM_GLIB_GNU_GETTEXT
PKG_CHECK_MODULES(MM, dbus-glib-1 >= 0.86 glib-2.0 >= 2.18 gmodule-2.0 gobject-2.0) PKG_CHECK_MODULES(MM, dbus-glib-1 >= 0.86 glib-2.0 >= 2.18 gmodule-2.0 gobject-2.0)
@@ -66,10 +71,6 @@ case $with_polkit in
# Check for polkit_authority_get_sync() # Check for polkit_authority_get_sync()
AC_CHECK_LIB([polkit-gobject-1], [polkit_authority_get_sync], ac_have_pk_auth_get_sync="1", ac_have_pk_auth_get_sync="0") AC_CHECK_LIB([polkit-gobject-1], [polkit_authority_get_sync], ac_have_pk_auth_get_sync="1", ac_have_pk_auth_get_sync="0")
AC_DEFINE_UNQUOTED(HAVE_POLKIT_AUTHORITY_GET_SYNC, $ac_have_pk_auth_get_sync, [Define if you have a polkit with polkit_authority_get_sync()]) AC_DEFINE_UNQUOTED(HAVE_POLKIT_AUTHORITY_GET_SYNC, $ac_have_pk_auth_get_sync, [Define if you have a polkit with polkit_authority_get_sync()])
# translation support for policy files
IT_PROG_INTLTOOL([0.35.0])
AM_GLIB_GNU_GETTEXT
;; ;;
*) *)
with_polkit=no with_polkit=no
@@ -162,4 +163,6 @@ echo Building PPP-enabled tests: ${have_pppd_headers}
echo echo
echo Building with PolicyKit support: ${with_polkit} echo Building with PolicyKit support: ${with_polkit}
echo echo
echo Building with Location API support: ${with_location_api}
echo