--- configure.in.orig	2013-10-02 18:32:45.000000000 +0200
+++ configure.in	2013-10-02 18:33:15.000000000 +0200
@@ -118,9 +118,9 @@
     gnome_keyring_requirement="gnome-keyring-1 >= gnome_keyring_required_version"
     GNOME_KEYRING="gnome-keyring-1"
 
-    if test x$GNOME_HAVE_X11 != xyes ; then
-        AC_MSG_ERROR([libX11 not found])
-    fi
+#    if test x$GNOME_HAVE_X11 != xyes ; then
+#        AC_MSG_ERROR([libX11 not found])
+#    fi
     ;;
 esac
 AM_CONDITIONAL(OS_WIN32, [test "$os_win32" = "yes"])
@@ -142,30 +142,34 @@
 dnl Check for -lSM (for gnome-client)
 dnl
 
-GNOME_HAVE_SM=true
-PKG_CHECK_MODULES(SM, sm ice, :, [
+GNOME_HAVE_SM=false
+SM_CFLAGS=""
+SM_LIBS=""
+# SM_LIBS is used in the .pc file
+AC_SUBST([SM_LIBS])
+# PKG_CHECK_MODULES(SM, sm ice, :, [
 # pkg-config modules not found (only present since X11R7); use old-style
 # detection
-AC_PATH_XTRA
+# AC_PATH_XTRA
 # X found
-if test x$no_x != xyes ; then
-    libgnomeui_save_cflags="$CFLAGS"
-    libgnomeui_save_libs="$LIBS"
-    CFLAGS="$X_CFLAGS"
-    LIBS="$X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS"
-    AC_CHECK_LIB(SM,
-                 SmcSaveYourselfDone,
-                 [SM_CFLAGS="$X_CFLAGS"
-                  SM_LIBS="$X_PRE_LIBS $X_LIBS -lSM -lICE $X_EXTRA_LIBS"],
-                 GNOME_HAVE_SM=false,
-                 $X_LIBS -lICE)
-    AC_CHECK_HEADERS(X11/SM/SMlib.h, :, GNOME_HAVE_SM=false)
-    CFLAGS="$libgnomeui_save_cflags"
-    LIBS="$libgnomeui_save_libs"
-else
-    GNOME_HAVE_SM=false
-fi
-])
+# if test x$no_x != xyes ; then
+#     libgnomeui_save_cflags="$CFLAGS"
+#     libgnomeui_save_libs="$LIBS"
+#     CFLAGS="$X_CFLAGS"
+#     LIBS="$X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS"
+#     AC_CHECK_LIB(SM,
+#                  SmcSaveYourselfDone,
+#                  [SM_CFLAGS="$X_CFLAGS"
+#                  SM_LIBS="$X_PRE_LIBS $X_LIBS -lSM -lICE $X_EXTRA_LIBS"],
+#                 GNOME_HAVE_SM=false,
+#                 $X_LIBS -lICE)
+#    AC_CHECK_HEADERS(X11/SM/SMlib.h, :, GNOME_HAVE_SM=false)
+#    CFLAGS="$libgnomeui_save_cflags"
+#    LIBS="$libgnomeui_save_libs"
+# else
+#    GNOME_HAVE_SM=false
+# fi
+# ])
 
 if test "$GNOME_HAVE_SM" = true; then
 	AC_DEFINE(HAVE_LIBSM, 1, [Define to 1 if you have libSM installed])