--- a/vmware-user/vmware-user.cpp
+++ b/vmware-user/vmware-user.cpp
@@ -529,7 +529,7 @@ VMwareUserRpcInSetOptionCB(char const **
    char *value;
    unsigned int index = 0;
    Bool ret = FALSE;
-   char *retStr = NULL;
+   const char *retStr = NULL;
 
    /* parse the option & value string */
    option = StrUtil_GetNextToken(&index, args, " ");
--- a/vmware-user/Makefile.am
+++ b/vmware-user/Makefile.am
@@ -75,7 +75,9 @@ vmware_user_LDADD += ../lib/err/libErr.l
 vmware_user_LDADD += ../lib/foundryMsg/libFoundryMsg.la
 vmware_user_LDADD += ../lib/backdoor/libBackdoor.la
 vmware_user_LDADD += ../lib/dict/libDict.la
+if HAVE_GTKMM
 vmware_user_LDADD += ../lib/dndGuest/libDndGuest.la
+endif
 vmware_user_LDADD += ../lib/dnd/libDnd.la
 vmware_user_LDADD += ../lib/dynxdr/libDynxdr.la
 vmware_user_LDADD += ../lib/hgfs/libHgfs.la