From c8cf438d44f7a4cd6700dbf9621329bffd960bf5 Mon Sep 17 00:00:00 2001
From: Nicholas Marriott <nicholas.marriott@gmail.com>
Date: Wed, 13 May 2009 23:27:00 +0000
Subject: Rename all feature flags to HAVE_* and move out of makefiles into a
 configure script which must be run before building.

Still two makefiles but they are a hell of a lot simpler.

HAVE_* also will make it easier to move to $buildsystem if necessary later.
---
 window.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'window.c')

diff --git a/window.c b/window.c
index 4e99c550..07214b78 100644
--- a/window.c
+++ b/window.c
@@ -1,4 +1,4 @@
-/* $Id: window.c,v 1.73 2009-05-04 17:58:27 nicm Exp $ */
+/* $Id: window.c,v 1.74 2009-05-13 23:27:00 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -28,24 +28,24 @@
 #include <termios.h>
 #include <unistd.h>
 
-#ifndef NO_PATHS_H
+#include "tmux.h"
+
+#ifdef HAVE_PATHS_H
 #include <paths.h>
 #endif
 
-#ifdef USE_LIBUTIL_H
+#ifdef HAVE_FORKPTY
+#ifdef HAVE_LIBUTIL_H
 #include <libutil.h>
-#else
+#endif
 #ifdef USE_PTY_H
 #include <pty.h>
-#else
-#ifndef NO_FORKPTY
-#include <util.h>
 #endif
+#ifdef HAVE_UTIL_H
+#include <util.h>
 #endif
 #endif
 
-#include "tmux.h"
-
 /*
  * Each window is attached to one or two panes, each of which is a pty. This
  * file contains code to handle them.
-- 
cgit