fixed addition of X11 -L and -l options on link lines.

client/Makefile.am

@@ -15,9 +15,12 @@ synergy_LDADD =						\
 	$(DEPTH)/io/libio.a				\
 	$(DEPTH)/mt/libmt.a				\
 	$(DEPTH)/base/libbase.a			\
-	-lX11							\
-	-lXext							\
+	$(X_LIBS)						\
+	$(X_PRE_LIBS)					\
 	-lXtst							\
+	-lXext							\
+	-lX11							\
+	$(X_EXTRA_LIBS)					\
 	$(NULL)
 INCLUDES =					\
 	-I$(DEPTH)/base 		\

configure.in

@@ -54,7 +54,6 @@ dnl checks for system services
 
 
 dnl adjust variables for X11 and pthreads
-LIBS="$X_PRE_LIBS $LIBS $X_EXTRA_LIBS $X_LIBS $PTHREAD_LIBS"
 CFLAGS="$CFLAGS $X_CFLAGS $PTHREAD_CFLAGS"
 CXXFLAGS="$CXXFLAGS $X_CFLAGS $PTHREAD_CFLAGS"
 CC="$PTHREAD_CC"

server/Makefile.am

@@ -20,9 +20,10 @@ synergyd_LDADD =					\
 	$(DEPTH)/io/libio.a				\
 	$(DEPTH)/mt/libmt.a				\
 	$(DEPTH)/base/libbase.a			\
+	$(X_LIBS)						\
+	$(X_PRE_LIBS)					\
 	-lX11							\
-	-lXext							\
-	-lXtst							\
+	$(X_EXTRA_LIBS)					\
 	$(NULL)
 INCLUDES =					\
 	-I$(DEPTH)/base 		\