Vinzenz Feenstra has uploaded a new change for review. Change subject: agent: Adding --with-dist for packaging ease ......................................................................
agent: Adding --with-dist for packaging ease Since not all platforms can fullfill the requirements of the configure script, but tar balls need to be creatable anyway, add a --with-dist to configure for being able to create the distribution tarballs anywhere. --with-dist on configure now disables the requirement checks. This is needed as for example F19 or RHEL6/CentOS won't be able to fulfill the requirements for the GDM plugin. Change-Id: If1daa4438d9037d47ed4e7ee0be35cb1c2755779 Signed-off-by: Vinzenz Feenstra <[email protected]> --- M configure.ac 1 file changed, 14 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-guest-agent refs/changes/96/16696/1 diff --git a/configure.ac b/configure.ac index 43f8d67..4946113 100644 --- a/configure.ac +++ b/configure.ac @@ -25,6 +25,11 @@ [If single sign on modules should be built, default=yes]), sso=${withval}, sso=yes) AC_SUBST(sso) +AC_ARG_WITH(dist, + AS_HELP_STRING([--with-dist], + [This configuration is for distribution creation only, default=no]), + dist=${withval}, dist=yes) +AC_SUBST(dist) AM_CONDITIONAL(BUILD_SSO_MODULES, [test -n "$sso" -a "x$sso" != xno ]) dnl --------------------------------------------------------------------------- @@ -33,11 +38,13 @@ PKG_PROG_PKG_CONFIG if test "x$sso" == "xyes"; then -AC_CHECK_HEADERS([arpa/inet.h fcntl.h stdlib.h string.h sys/socket.h unistd.h]) + if test "x$dist" == "xno"; then + AC_CHECK_HEADERS([arpa/inet.h fcntl.h stdlib.h string.h sys/socket.h unistd.h]) -AC_CHECK_FUNCS([memset select socket strchr strerror strndup]) + AC_CHECK_FUNCS([memset select socket strchr strerror strndup]) -AC_CHECK_LIB([pam], [pam_get_user]) + AC_CHECK_LIB([pam], [pam_get_user]) + fi fi AC_TYPE_SIZE_T @@ -81,23 +88,27 @@ GDM_SIMPLE_GREETER_REQUIRED="gdmsimplegreeter >= $GDM_SIMPLE_GREETER_REQUIRED_VERSION" fi + if test "x$dist" == "xno"; then PKG_CHECK_MODULES(GDM_PLUGIN, dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION $GDM_SIMPLE_GREETER_REQUIRED gobject-2.0 >= $GLIB_REQUIRED_VERSION gtk+-2.0 >= $GTK_REQUIRED_VERSION ) + fi GDM_PLUGIN_LIBS="$GDM_PLUGIN_LIBS -lm" AC_SUBST(GDM_PLUGIN_CFLAGS) AC_SUBST(GDM_PLUGIN_LIBS) QT_REQUIRED_VERSION=4.6.2 + if test "x$dist" == "xno"; then PKG_CHECK_MODULES(KDM_PLUGIN, QtCore >= $QT_REQUIRED_VERSION QtDBus >= $QT_REQUIRED_VERSION QtGui >= $QT_REQUIRED_VERSION ) + fi KDM_PLUGIN_LIBS="$KDM_PLUGIN_LIBS -lm" AC_SUBST(KDM_PLUGIN_CFLAGS) AC_SUBST(KDM_PLUGIN_LIBS) -- To view, visit http://gerrit.ovirt.org/16696 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If1daa4438d9037d47ed4e7ee0be35cb1c2755779 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-guest-agent Gerrit-Branch: master Gerrit-Owner: Vinzenz Feenstra <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
