diff options
| -rw-r--r-- | kresources/Makefile.am | 40 | ||||
| -rw-r--r-- | kresources/configure.in.in | 99 | ||||
| -rw-r--r-- | wizards/Makefile.am | 66 | ||||
| -rw-r--r-- | wizards/groupwarewizard.h | 2 |
4 files changed, 196 insertions, 11 deletions
diff --git a/kresources/Makefile.am b/kresources/Makefile.am index b5471d901..c0ca6cd2a 100644 --- a/kresources/Makefile.am +++ b/kresources/Makefile.am @@ -1,5 +1,41 @@ if include_exchange_SUBDIR -EXCHANGE_SUBDIR=exchange +EXCHANGE_SUBDIR=exchange +endif + +if include_egroupware_SUBDIR +EGROUPWARE_SUBDIR=egroupware +endif + +if include_kolab_SUBDIR +KOLAB_SUBDIR=kolab +endif + +if include_slox_SUBDIR +SLOX_SUBDIR=slox +endif + +if include_groupwise_SUBDIR +GROUPWISE_SUBDIR=groupwise +endif + +if include_featureplan_SUBDIR +FEATUREPLAN_SUBDIR=featureplan +endif + +if include_groupdav_SUBDIR +GROUPDAV_SUBDIR=groupdav +endif + +if include_birthdays_SUBDIR +BIRTHDAYS_SUBDIR=birthdays +endif + +if include_newexchange_SUBDIR +NEWEXCHANGE_SUBDIR=newexchange +endif + +if include_scalix_SUBDIR +SCALIX_SUBDIR=scalix endif if include_caldav_SUBDIR @@ -10,5 +46,5 @@ if include_carddav_SUBDIR CARDDAV_SUBDIR=carddav endif -SUBDIRS = lib remote egroupware $(EXCHANGE_SUBDIR) kolab slox groupwise featureplan groupdav birthdays newexchange scalix $(CALDAV_SUBDIR) $(CARDDAV_SUBDIR) +SUBDIRS = lib remote $(EGROUPWARE_SUBDIR) $(EXCHANGE_SUBDIR) $(KOLAB_SUBDIR) $(SLOX_SUBDIR) $(GROUPWISE_SUBDIR) $(FEATUREPLAN_SUBDIR) $(GROUPDAV_SUBDIR) $(BIRTHDAYS_SUBDIR) $(NEWEXCHANGE_SUBDIR) $(SCALIX_SUBDIR) $(CALDAV_SUBDIR) $(CARDDAV_SUBDIR) # SUBDIRS = remote egroupware $(EXCHANGE_SUBDIR) kolab slox groupwise featureplan diff --git a/kresources/configure.in.in b/kresources/configure.in.in index fe766e834..3a3009d66 100644 --- a/kresources/configure.in.in +++ b/kresources/configure.in.in @@ -1,6 +1,105 @@ #MIN_CONFIG dnl Say what we're doing +AC_MSG_CHECKING(if egroupware resource is allowed) +AC_ARG_ENABLE(caldav, [ --disable-egroupware disable egroupware support ], with_egroupware=$enableval, with_egroupware=yes) +if test "$with_egroupware" = "yes"; then + AC_MSG_RESULT([yes]) + AM_CONDITIONAL(include_egroupware_SUBDIR, test true = true) +else + AC_MSG_RESULT([no]) + AM_CONDITIONAL(include_egroupware_SUBDIR, test true = false) +fi + +dnl Say what we're doing +AC_MSG_CHECKING(if kolab resource is allowed) +AC_ARG_ENABLE(caldav, [ --disable-kolab disable kolab support ], with_kolab=$enableval, with_kolab=yes) +if test "$with_kolab" = "yes"; then + AC_MSG_RESULT([yes]) + AM_CONDITIONAL(include_kolab_SUBDIR, test true = true) +else + AC_MSG_RESULT([no]) + AM_CONDITIONAL(include_kolab_SUBDIR, test true = false) +fi + +dnl Say what we're doing +AC_MSG_CHECKING(if slox resource is allowed) +AC_ARG_ENABLE(caldav, [ --disable-slox disable slox support ], with_slox=$enableval, with_slox=yes) +if test "$with_slox" = "yes"; then + AC_MSG_RESULT([yes]) + AM_CONDITIONAL(include_slox_SUBDIR, test true = true) +else + AC_MSG_RESULT([no]) + AM_CONDITIONAL(include_slox_SUBDIR, test true = false) +fi + +dnl Say what we're doing +AC_MSG_CHECKING(if groupwise resource is allowed) +AC_ARG_ENABLE(caldav, [ --disable-groupwise disable groupwise support ], with_groupwise=$enableval, with_groupwise=yes) +if test "$with_groupwise" = "yes"; then + AC_MSG_RESULT([yes]) + AM_CONDITIONAL(include_groupwise_SUBDIR, test true = true) +else + AC_MSG_RESULT([no]) + AM_CONDITIONAL(include_groupwise_SUBDIR, test true = false) +fi + +dnl Say what we're doing +AC_MSG_CHECKING(if featureplan resource is allowed) +AC_ARG_ENABLE(featureplan, [ --disable-featureplan disable featureplan support ], with_featureplan=$enableval, with_featureplan=yes) +if test "$with_featureplan" = "yes"; then + AC_MSG_RESULT([yes]) + AM_CONDITIONAL(include_featureplan_SUBDIR, test true = true) +else + AC_MSG_RESULT([no]) + AM_CONDITIONAL(include_featureplan_SUBDIR, test true = false) +fi + +dnl Say what we're doing +AC_MSG_CHECKING(if groupdav resource is allowed) +AC_ARG_ENABLE(groupdav, [ --disable-groupdav disable groupdav support ], with_groupdav=$enableval, with_groupdav=yes) +if test "$with_groupdav" = "yes"; then + AC_MSG_RESULT([yes]) + AM_CONDITIONAL(include_groupdav_SUBDIR, test true = true) +else + AC_MSG_RESULT([no]) + AM_CONDITIONAL(include_groupdav_SUBDIR, test true = false) +fi + +dnl Say what we're doing +AC_MSG_CHECKING(if birthdays resource is allowed) +AC_ARG_ENABLE(birthdays, [ --disable-birthdays disable birthdays support ], with_birthdays=$enableval, with_birthdays=yes) +if test "$with_birthdays" = "yes"; then + AC_MSG_RESULT([yes]) + AM_CONDITIONAL(include_birthdays_SUBDIR, test true = true) +else + AC_MSG_RESULT([no]) + AM_CONDITIONAL(include_birthdays_SUBDIR, test true = false) +fi + +dnl Say what we're doing +AC_MSG_CHECKING(if newexchange resource is allowed) +AC_ARG_ENABLE(newexchange, [ --disable-newexchange disable newexchange support ], with_newexchange=$enableval, with_newexchange=yes) +if test "$with_newexchange" = "yes"; then + AC_MSG_RESULT([yes]) + AM_CONDITIONAL(include_newexchange_SUBDIR, test true = true) +else + AC_MSG_RESULT([no]) + AM_CONDITIONAL(include_newexchange_SUBDIR, test true = false) +fi + +dnl Say what we're doing +AC_MSG_CHECKING(if scalix resource is allowed) +AC_ARG_ENABLE(scalix, [ --disable-scalix disable scalix support ], with_scalix=$enableval, with_scalix=yes) +if test "$with_scalix" = "yes"; then + AC_MSG_RESULT([yes]) + AM_CONDITIONAL(include_scalix_SUBDIR, test true = true) +else + AC_MSG_RESULT([no]) + AM_CONDITIONAL(include_scalix_SUBDIR, test true = false) +fi + +dnl Say what we're doing AC_MSG_CHECKING(if caldav resource is allowed) AC_ARG_ENABLE(caldav, [ --disable-caldav disable caldav support (caldav resources such as Google Calendar and Zimbra will not function) ], with_caldav=$enableval, with_caldav=yes) if test "$with_caldav" = "yes"; then diff --git a/wizards/Makefile.am b/wizards/Makefile.am index 1c953b9ff..468405db2 100644 --- a/wizards/Makefile.am +++ b/wizards/Makefile.am @@ -9,14 +9,44 @@ INCLUDES = -I$(top_srcdir)/libkpimidentities -I$(top_srcdir)/libkcal \ -I$(top_srcdir)/kresources/lib \ $(all_includes) -bin_PROGRAMS = groupwarewizard egroupwarewizard sloxwizard kolabwizard \ - groupwisewizard exchangewizard scalixwizard - -kde_module_LTLIBRARIES = libegroupwarewizard.la libsloxwizard.la \ - libkolabwizard.la \ - libexchangewizard.la \ - libgroupwisewizard.la \ - libscalixwizard.la +if include_exchange_SUBDIR +EXCHANGE_BIN_WIZARD=exchangewizard +EXCHANGE_LIB_LA=libexchangewizard.la +endif + +if include_egroupware_SUBDIR +EGROUPWARE_BIN_WIZARD=egroupwarewizard +EGROUPWARE_LIB_LA=libegroupwarewizard.la +endif + +if include_slox_SUBDIR +SLOX_BIN_WIZARD=sloxwizard +SLOX_LIB_LA=libsloxwizard.la +endif + +if include_kolab_SUBDIR +KOLAB_BIN_WIZARD=kolabwizard +KOLAB_LIB_LA=libkolabwizard.la +endif + +if include_groupwise_SUBDIR +GROUPWISE_BIN_WIZARD=groupwisewizard +GROUPWISE_LIB_LA=libgroupwisewizard.la +endif + +if include_scalix_SUBDIR +SCALIX_BIN_WIZARD=scalixwizard +SCALIX_LIB_LA=libscalixwizard.la +endif + +bin_PROGRAMS = groupwarewizard $(EGROUPWARE_BIN_WIZARD) $(SLOX_BIN_WIZARD) $(KOLAB_BIN_WIZARD) \ + $(GROUPWISE_BIN_WIZARD) $(EXCHANGE_BIN_WIZARD) $(SCALIX_BIN_WIZARD) + +kde_module_LTLIBRARIES = $(EGROUPWARE_LIB_LA) $(SLOX_LIB_LA) \ + $(KOLAB_LIB_LA) \ + $(EXCHANGE_LIB_LA) \ + $(GROUPWISE_LIB_LA) \ + $(SCALIX_LIB_LA) groupwarewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) @@ -27,6 +57,7 @@ groupwarewizard_LDADD = libegroupwarewizard.la libsloxwizard.la $(LIB_KDEUI) \ groupwarewizard_SOURCES = groupwarewizard.cpp main.cpp overviewpage.cpp # Kolab +if include_kolab_SUBDIR libkolabwizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) libkolabwizard_la_LIBADD = $(top_builddir)/kresources/kolab/kcal/libkcalkolab.la \ $(top_builddir)/kresources/kolab/kabc/libkabckolab.la \ @@ -41,8 +72,10 @@ libkolabwizard_la_SOURCES = kolabwizard.cpp kmailchanges.cpp kolabconfig.kcfgc \ kolabwizard_LDADD = libkolabwizard.la $(LIB_KDEUI) kolabwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) kolabwizard_SOURCES = kolabmain.cpp +endif # eGroupware +if include_egroupware_SUBDIR libegroupwarewizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) libegroupwarewizard_la_SOURCES = egroupwarewizard.cpp egroupwareconfig.kcfgc libegroupwarewizard_la_LIBADD = $(top_builddir)/kresources/egroupware/libkabc_xmlrpc.la \ @@ -57,17 +90,21 @@ egroupwarewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) egroupwarewizard_SOURCES = egroupwaremain.cpp # SLOX +if include_slox_SUBDIR libsloxwizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) libsloxwizard_la_SOURCES = sloxwizard.cpp sloxconfig.kcfgc libsloxwizard_la_LIBADD = $(top_builddir)/kresources/slox/libkcal_slox.la \ $(top_builddir)/kresources/slox/libkabc_slox.la \ $(top_builddir)/libkdepim/libkdepim.la +endif sloxwizard_LDADD = libsloxwizard.la sloxwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) sloxwizard_SOURCES = sloxmain.cpp +endif # GroupWise +if include_groupwise_SUBDIR libgroupwisewizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) libgroupwisewizard_la_SOURCES = groupwisewizard.cpp groupwiseconfig.kcfgc \ kmailchanges.cpp @@ -82,8 +119,10 @@ libgroupwisewizard_la_COMPILE_FIRST = $(top_builddir)/kresources/groupwise/kabc_ groupwisewizard_LDADD = libgroupwisewizard.la groupwisewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) groupwisewizard_SOURCES = groupwisemain.cpp +endif # Exchange +if include_exchange_SUBDIR libexchangewizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) libexchangewizard_la_SOURCES = exchangewizard.cpp libexchangewizard_la_LIBADD = $(top_builddir)/kresources/newexchange/libkcal_newexchange.la \ @@ -93,8 +132,10 @@ libexchangewizard_la_LIBADD = $(top_builddir)/kresources/newexchange/libkcal_new exchangewizard_LDADD = libexchangewizard.la exchangewizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) exchangewizard_SOURCES = exchangemain.cpp +endif # Scalix +if include_scalix_SUBDIR libscalixwizard_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) libscalixwizard_la_LIBADD = $(top_builddir)/kresources/scalix/kcal/libkcalscalix.la \ $(top_builddir)/kresources/scalix/kabc/libkabcscalix.la \ @@ -108,6 +149,7 @@ libscalixwizard_la_SOURCES = scalixwizard.cpp kmailchanges.cpp scalixconfig.kcfg scalixwizard_LDADD = libscalixwizard.la $(LIB_KDEUI) scalixwizard_LDFLAGS = $(all_libraries) $(KDE_RPATH) scalixwizard_SOURCES = scalixmain.cpp +endif noinst_HEADERS = egroupwarewizard.h kmailchanges.h kolabwizard.h sloxwizard.h \ groupwisewizard.h exchangewizard.h @@ -117,8 +159,16 @@ kde_kcfg_DATA = egroupware.kcfg slox.kcfg kolab.kcfg groupwise.kcfg scalix.kcfg messages: rc.cpp $(XGETTEXT) *.cpp -o $(podir)/kdepimwizards.pot +if include_egroupware_SUBDIR egroupwarewizard.lo: ../kresources/egroupware/kabc_egroupwareprefs.h ../kresources/egroupware/kcal_egroupwareprefs.h ../kresources/egroupware/knotes_egroupwareprefs.h +endif + +if include_exchange_SUBDIR exchangewizard.lo: ../kresources/lib/kresources_groupwareprefs.h +endif + +if include_slox_SUBDIR sloxwizard.lo: ../kresources/slox/kabcsloxprefs.h ../kresources/slox/kcalsloxprefs.h +endif xdg_apps_DATA = groupwarewizard.desktop diff --git a/wizards/groupwarewizard.h b/wizards/groupwarewizard.h index 9a6c25885..6946c360e 100644 --- a/wizards/groupwarewizard.h +++ b/wizards/groupwarewizard.h @@ -26,7 +26,7 @@ class OverViewPage; -class GroupwareWizard : public QWidget +class GroupwareWizard : public TQWidget { Q_OBJECT |