SVN commit 485761 by vkrause: Disable compilation of the GroupWise resource for now. See http://lists.kde.org/?l=kde-pim&m=113131952305398&w=2 for details. M +1 -1 kresources/Makefile.am M +13 -13 wizards/Makefile.am M +3 -2 wizards/overviewpage.cpp --- trunk/KDE/kdepim/kresources/Makefile.am #485760:485761 @@ -1 +1 @@ -SUBDIRS = lib remote egroupware kolab slox groupwise featureplan groupdav birthdays blogging +SUBDIRS = lib remote egroupware kolab slox featureplan groupdav birthdays blogging --- trunk/KDE/kdepim/wizards/Makefile.am #485760:485761 @@ -10,7 +10,7 @@ $(all_includes) bin_PROGRAMS = groupwarewizard egroupwarewizard sloxwizard kolabwizard \ - groupwisewizard +# groupwisewizard kde_module_LTLIBRARIES = libegroupwarewizard.la libsloxwizard.la \ libkolabwizard.la libgroupwisewizard.la @@ -63,20 +63,20 @@ sloxwizard_SOURCES = sloxmain.cpp # GroupWise -libgroupwisewizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) -libgroupwisewizard_la_SOURCES = groupwisewizard.cpp groupwiseconfig.kcfgc \ - kmailchanges.cpp -libgroupwisewizard_la_LIBADD = $(top_builddir)/kresources/groupwise/libkcal_groupwise.la \ - $(top_builddir)/kresources/groupwise/libkabc_groupwise.la \ - $(top_builddir)/libkdepim/libkdepim.la \ - $(top_builddir)/libkpimidentities/libkpimidentities.la -libgroupwisewizard_la_COMPILE_FIRST = $(top_builddir)/kresources/groupwise/kabc_groupwiseprefs.h \ - $(top_builddir)/kresources/groupwise/kcal_groupwiseprefsbase.h +#libgroupwisewizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) +#libgroupwisewizard_la_SOURCES = groupwisewizard.cpp groupwiseconfig.kcfgc \ +# kmailchanges.cpp +#libgroupwisewizard_la_LIBADD = $(top_builddir)/kresources/groupwise/libkcal_groupwise.la \ +# $(top_builddir)/kresources/groupwise/libkabc_groupwise.la \ +# $(top_builddir)/libkdepim/libkdepim.la \ +# $(top_builddir)/libkpimidentities/libkpimidentities.la +#libgroupwisewizard_la_COMPILE_FIRST = $(top_builddir)/kresources/groupwise/kabc_groupwiseprefs.h \ +# $(top_builddir)/kresources/groupwise/kcal_groupwiseprefsbase.h -groupwisewizard_LDADD = libgroupwisewizard.la -groupwisewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) -groupwisewizard_SOURCES = groupwisemain.cpp +#groupwisewizard_LDADD = libgroupwisewizard.la +#groupwisewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) +#groupwisewizard_SOURCES = groupwisemain.cpp noinst_HEADERS = egroupwarewizard.h kmailchanges.h kolabwizard.h sloxwizard.h \ groupwisewizard.h --- trunk/KDE/kdepim/wizards/overviewpage.cpp #485760:485761 @@ -117,8 +117,9 @@ void OverViewPage::showWizardGroupwise() { - GroupwiseWizard wizard; - wizard.exec(); +#warning Re-enable me as soon as we have the new GroupWise resource! +// GroupwiseWizard wizard; +// wizard.exec(); } #include "overviewpage.moc"