Hi,
Ticket 233 (http://trac.openchange.org/ticket/233) is a problem originally
identified by Alan Alvarez in that we can't build openchange without popt being
available.
Tonight I deleted the popt-devel package on my laptop, and looked at the
damage. Looks like there are three problems:
1. The original problem identified by Alan, which is that
libmapiadmin/mapiadmin_user.c won't build. It looks like an unnecessary
include - I just removed it.
2. The torture modules won't build. That looks like a required dependency. So
we can't build those if popt isn't available.
3. The mapistore test won't build. That looks like a required dependency. So
we can't build that if popt isn't available.
Attached is the proposed patch. Does this look ok?
Brad
Index: libmapiadmin/mapiadmin_user.c
===================================================================
--- libmapiadmin/mapiadmin_user.c (revision 1687)
+++ libmapiadmin/mapiadmin_user.c (working copy)
@@ -28,7 +28,6 @@
#include <param.h>
#include <credentials.h>
-#include <samba/popt.h>
#include <ldb_errors.h>
#include <ldb_wrap.h>
#include <ldap_ndr.h>
Index: configure.ac
===================================================================
--- configure.ac (revision 1687)
+++ configure.ac (working copy)
@@ -432,7 +432,7 @@
])
if test x"$enable_libmapiadmin" = x"yes"; then
- PKG_CHECK_MODULES(SAMR, dcerpc_samr)
+ PKG_CHECK_MODULES(SAMR, dcerpc_samr)
OC_RULE_ADD(libmapiadmin, LIBS)
fi
@@ -481,7 +481,10 @@
OC_RULE_ADD(openchangemapidump, TOOLS)
OC_RULE_ADD(schemaIDGUID, TOOLS)
OC_RULE_ADD(locale_codepage, TOOLS)
+
+ OC_MAPISTORE_TEST="mapistore_test"
fi
+AC_SUBST(OC_MAPISTORE_TEST)
dnl --------------------------------------------------------------------------
dnl Check for libmagic
@@ -532,7 +535,8 @@
dnl ##########################################################################
AC_PATH_PROG([SMBTORTURE], [smbtorture], no)
-if test x"$SMBTORTURE" != x""; then
+if test x"$SMBTORTURE" != x"" &&
+ test x"$enable_libpopt" = x"yes"; then
TORTURE_MODULESDIR=`$PKG_CONFIG --variable=modulesdir torture`
AC_SUBST(TORTURE_MODULESDIR)
OC_RULE_ADD(torture, TORTURE)
Index: config.mk.in
===================================================================
--- config.mk.in (revision 1687)
+++ config.mk.in (working copy)
@@ -95,6 +95,7 @@
oc_mapistore_cle...@oc_mapistore_clean@
oc_mapistore_insta...@oc_mapistore_install@
oc_mapistore_uninsta...@oc_mapistore_uninstall@
+oc_mapistore_te...@oc_mapistore_test@
sqlite_cfla...@sqlite_cflags@
sqlite_li...@sqlite_libs@
Index: Makefile
===================================================================
--- Makefile (revision 1687)
+++ Makefile (working copy)
@@ -937,7 +937,7 @@
libmapistore: mapiproxy/libmapistore.$(SHLIBEXT).$(PACKAGE_VERSION) \
$(OC_MAPISTORE) \
- mapistore_test
+ $(OC_MAPISTORE_TEST)
libmapistore-install: $(OC_MAPISTORE_INSTALL)
$(INSTALL) -m 0755 mapiproxy/libmapistore.$(SHLIBEXT).$(PACKAGE_VERSION) $(DESTDIR)$(libdir)
_______________________________________________
devel mailing list
[email protected]
http://mailman.openchange.org/listinfo/devel
