-dnl Removed this from the source tree
-dnl AC_ARG_ENABLE(telnetserver,
-dnl [ --enable-telnetserver Use the Telnet server],
-dnl [
-dnl if test $enableval = "yes"; then
-dnl TSERVER_DEFINES="-DTSERVER"
-dnl TSERVER_SOURCES=""
-dnl TSERVER_INCLUDES=""
-dnl fi
-dnl AC_SUBST(TSERVER_DEFINES)
-dnl AC_SUBST(TSERVER_SOURCES)
-dnl AC_SUBST(TSERVER_INCLUDES)
-dnl ])
+AC_SUBST(CXXFLAGS, "$PTHREAD_CFLAGS $GUILE_CFLAGS $CXXFLAGS")
+AC_SUBST(LDFLAGS, "$GUILE_LDFLAGS $LDFLAGS")
+AC_SUBST(LIBS, "$PTHREAD_LIBS $LIBS")