2 files changed, 4 insertions, 2 deletions
diff --git a/configure b/configure
index c10b1f6b..24ac93cd 100755
--- a/configure
+++ b/configure
@@ -18,7 +18,7 @@ includedir='$prefix/include/bitlbee/'
 systemdsystemunitdir=''
 libevent='/usr/'
 pidfile='/var/run/bitlbee.pid'
-ipcsocket='/var/run/bitlbee.sock'
+ipcsocket=''
 pcdir='$prefix/lib/pkgconfig'
 systemlibdirs="/lib /lib64 /usr/lib /usr/lib64 /usr/local/lib /usr/local/lib64"
 
@@ -66,7 +66,6 @@ Option		Description				Default
 --systemdsystemunitdir=...				$systemdsystemunitdir
 --pidfile=...						$pidfile
 --config=...						$config
---ipcsocket=...						$ipcsocket
 
 --msn=0/1	Disable/enable MSN part			$msn
 --jabber=0/1	Disable/enable Jabber part		$jabber
diff --git a/ipc.c b/ipc.c
index 884039d2..5da9d8e4 100644
--- a/ipc.c
+++ b/ipc.c
@@ -908,6 +908,9 @@ int ipc_master_listen_socket()
 	struct sockaddr_un un_addr;
 	int serversock;
 
+	if (!IPCSOCKET || !*IPCSOCKET)
+		return 1;
+
 	/* Clean up old socket files that were hanging around.. */
 	if (unlink(IPCSOCKET) == -1 && errno != ENOENT) {
 		log_message( LOGLVL_ERROR, "Could not remove old IPC socket at %s: %s", IPCSOCKET, strerror(errno) );