Deactivated internal iso kio-slave by default due to inclusion of kio_iso into kdelibs

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/krusader@1123557 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

Makefile.am

@@ -5,7 +5,11 @@ if with_tar
 TARDIR = tar
 endif
 
-SUBDIRS = krusader po pics doc krArc iso virt $(TARDIR)
+if with_iso
+ISODIR = iso
+endif
+
+SUBDIRS = krusader po pics doc krArc $(ISODIR) virt $(TARDIR)
 
 EXTRA_DIST = krusader.kdevprj admin AUTHORS COPYING ChangeLog INSTALL README TODO krusader.lsm krusader.spec 
 

configure.in.in

@@ -79,7 +79,7 @@ fi
 AM_CONDITIONAL(include_libkjsembed, test "$have_libkjsembed" = yes)
 
 ###################################################
-#		If our own tar-KIO schould be build
+#		If our own tar-KIO should be built
 ###################################################
 
 AC_ARG_WITH(kiotar,
@@ -92,6 +92,20 @@ AM_CONDITIONAL(with_tar, test "$with_tar" != "no")
 
 ###################################################
 
+###################################################
+#		If our own iso-KIO should be built
+###################################################
+
+AC_ARG_WITH(kioiso,
+    AC_HELP_STRING([--with-kioiso],[use our version of Trinity's iso KIO-slave [default=without]]),
+    [with_iso=$withval],
+    [with_iso=no]
+)
+
+AM_CONDITIONAL(with_iso, test "$with_iso" != "no")
+
+###################################################
+
 AM_INIT_AUTOMAKE(krusader,1.90.0)
 # This adds the RELEASE_NAME-Marco to config.h (where also VERSION is defined).
 # It can be used to add a name to a release. If commented out only VERSION is used, see main.cpp

iso/Makefile.am

@@ -17,7 +17,7 @@ kio_iso_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 SUBDIRS = libisofs
 
 noinst_HEADERS = iso.h kiso.h qfilehack.h kisofile.h kisodirectory.h
-EXTRA_DIST = iso.protocol isoservice.desktop 
+EXTRA_DIST = iso.protocol isoservice.desktop kio_iso.desktop
 
 install-data-local:
 	$(mkinstalldirs)  $(DESTDIR)$(kde_servicesdir)/
@@ -26,11 +26,14 @@ install-data-local:
 	$(INSTALL_DATA) $(srcdir)/isoservice.desktop  $(DESTDIR)$(kde_datadir)/konqueror/servicemenus/isoservice.desktop
 	$(mkinstalldirs)  $(DESTDIR)$(kde_confdir)/
 	$(INSTALL_DATA) $(srcdir)/kio_isorc $(DESTDIR)$(kde_confdir)/kio_isorc
+	$(mkinstalldirs)  $(DESTDIR)$(kde_appsdir)/
+	$(INSTALL_DATA) $(srcdir)/kio_iso.desktop  $(DESTDIR)$(kde_appsdir)/kio_iso.desktop
 
 uninstall-local:
 	-rm -f  $(DESTDIR)$(kde_servicesdir)/iso.protocol
 	-rm -f  $(DESTDIR)$(kde_datadir)/konqueror/servicemenus/isoservice.desktop
 	-rm -f  $(DESTDIR)$(kde_confdir)/kio_isorc
+	-rm -f  $(DESTDIR)$(kde_appsdir)/kio_iso.desktop
 
 # These paths are KDE specific. Use them:
 # kde_appsdir         Where your application's menu entry (.desktop) should go to.