[gnome-commander] Made samba optional in connections list



commit 7670584aee49686d715b368b67172e70b8a1e215
Author: Uwe Scholz <uwescholz src gnome org>
Date:   Wed Jun 4 10:21:11 2014 +0200

    Made samba optional in connections list

 configure.ac              |    8 +++++++-
 src/gnome-cmd-con-list.cc |    5 ++++-
 2 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index c861ecd..48c5bc8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -215,12 +215,18 @@ AC_SUBST([UNIQUE_VERSION])
 
 
 dnl Check for samba support
-AC_ARG_WITH(samba, [  --without-samba         disable SAMBA support], have_samba=no, have_samba=yes)
+AC_ARG_WITH(samba, [  --without-samba         disable SAMBA support])
+have_samba=no
 if test "x$with_samba" != xno; then
    if test "x$have_gnomevfs" != xyes; then
    have_samba=no
+   else
+   have_samba=yes
    fi
 fi
+if test "x$have_samba" = "xyes"; then
+   AC_DEFINE(HAVE_SAMBA, 1, [Define to 1 if you have SAMBA support])
+fi
 
 
 dnl Check for exiv2 support
diff --git a/src/gnome-cmd-con-list.cc b/src/gnome-cmd-con-list.cc
index 611ca63..4ab87cb 100644
--- a/src/gnome-cmd-con-list.cc
+++ b/src/gnome-cmd-con-list.cc
@@ -146,13 +146,16 @@ static void init (GnomeCmdConList *con_list)
     con_list->priv->update_lock = FALSE;
 
     con_list->priv->home_con = gnome_cmd_con_home_new ();
+#ifdef HAVE_SAMBA
     con_list->priv->smb_con = gnome_cmd_con_smb_new ();
-
+#endif
     // con_list->priv->remote_cons = NULL;
     // con_list->priv->device_cons = NULL;
     // con_list->priv->quick_ftp_cons = NULL;
     con_list->priv->all_cons = g_list_append (NULL, con_list->priv->home_con);
+#ifdef HAVE_SAMBA
     con_list->priv->all_cons = g_list_append (con_list->priv->all_cons, con_list->priv->smb_con);
+#endif
 }
 
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]