X-Git-Url: http://git.draconx.ca/gitweb/dxcommon.git/blobdiff_plain/476f42d951d7e9f9f30e1a6acb34982466936490..7b34413e9942b5777aed4fd3dc9c261214981e74:/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e859c4d..2011625 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-AM_CPPFLAGS = -I$(top_srcdir)/src
+AM_CPPFLAGS = -I$(top_srcdir)/src $(STUB_INCLUDES)
 
 check_LIBRARIES = t/libdummy.a t/libempty.a
 
@@ -17,22 +17,19 @@ t_packtests_SOURCES = t/packtests.c src/pack.c src/tap.c
 t_packtestu64_SOURCES = t/packtestu64.c src/pack.c src/tap.c
 t_packtests64_SOURCES = t/packtests64.c src/pack.c src/tap.c
 
-if HAVE_STRUCT_OPTION
 check_PROGRAMS += t/helpdesc t/helpopt t/helpopt2
-
 if HAVE_WCWIDTH
 check_PROGRAMS += t/helpopt3
 endif
-endif
 
 EXTRA_LIBRARIES = libglohelp.a
 libglohelp_a_SOURCES = src/help.c
-libglohelp_a_CPPFLAGS = -DHELP_GETOPT_LONG_ONLY
+libglohelp_a_CPPFLAGS = $(AM_CPPFLAGS) -DHELP_GETOPT_LONG_ONLY
 libglohelp_a_SHORTNAME = glo
 
 EXTRA_LIBRARIES += libnlshelp.a
 libnlshelp_a_SOURCES = src/help.c t/nls/mbswidth.c
-libnlshelp_a_CPPFLAGS = -DENABLE_NLS -I$(top_srcdir)/t/nls
+libnlshelp_a_CPPFLAGS = $(AM_CPPFLAGS) -DENABLE_NLS -I$(top_srcdir)/t/nls
 libnlshelp_a_SHORTNAME = nls
 
 t_helpdesc_SOURCES = t/helpdesc.c src/help.c src/tap.c
@@ -53,7 +50,7 @@ EXTRA_t_copysym_DEPENDENCIES = $(t_copysym_LDADD)
 
 EXTRA_LIBRARIES += libnlscopysym.a
 libnlscopysym_a_SOURCES = src/copysym.c
-libnlscopysym_a_CPPFLAGS = -DENABLE_NLS
+libnlscopysym_a_CPPFLAGS = $(AM_CPPFLAGS) -DENABLE_NLS
 libnlscopysym_a_SHORTNAME = nls
 
 DISTCLEANFILES =