From b5ed0d6c8c17b73f110e5372070fc1f15601fa3a Mon Sep 17 00:00:00 2001
From: Amar Takhar <verm@aegisub.org>
Date: Thu, 24 Jun 2010 01:49:48 +0000
Subject: [PATCH] wrap config.h include under LAGI and put -DLAGI when
 compiling to ensure it's only included when building libaegisub.

Originally committed to SVN as r4585.
---
 aegisub/libaegisub/Makefile.am                | 2 +-
 aegisub/libaegisub/include/libaegisub/types.h | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/aegisub/libaegisub/Makefile.am b/aegisub/libaegisub/Makefile.am
index f7a114db9..dfd2a7ae1 100644
--- a/aegisub/libaegisub/Makefile.am
+++ b/aegisub/libaegisub/Makefile.am
@@ -4,7 +4,7 @@ AM_CXXFLAGS=
 DISTCLEANFILES=
 
 lib_LTLIBRARIES = libaegisub-2.2.la
-libaegisub_2_2_la_CPPFLAGS = -I../src/include -Iinclude -I. @WX_CPPFLAGS@ -pedantic
+libaegisub_2_2_la_CPPFLAGS = -I../src/include -Iinclude -I. @WX_CPPFLAGS@ -pedantic -DLAGI
 libaegisub_2_2_la_LDFLAGS = @ICONV_LDFLAGS@
 
 if PRECOMPILED_HEADER
diff --git a/aegisub/libaegisub/include/libaegisub/types.h b/aegisub/libaegisub/include/libaegisub/types.h
index ba5fbeecc..c85bf68b8 100644
--- a/aegisub/libaegisub/include/libaegisub/types.h
+++ b/aegisub/libaegisub/include/libaegisub/types.h
@@ -18,10 +18,11 @@
 /// @brief Platform specific types.
 /// @ingroup libaegisub
 
-#ifndef LAGI_PRE
-
+#ifdef LAGI
 #include "config.h"
+#endif
 
+#ifndef LAGI_PRE
 #ifdef HAVE_SYS_TIME_H
 #  include <sys/time.h>
 #else