From 4d98c2007fed6210a287edffe0cb118bd16f111b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien.villemot@ens.fr>
Date: Thu, 20 Sep 2012 07:50:04 +0200
Subject: [PATCH] Rename CFLAGS_MATIO to CPPFLAGS_MATIO

---
 m4/ax_matio.m4                        | 12 ++++++------
 mex/build/dynare_simul_.am            |  2 +-
 mex/build/estimation.am               |  2 +-
 mex/build/k_order_perturbation.am     |  4 ++--
 mex/build/octave/ms_sbvar/Makefile.am |  4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/m4/ax_matio.m4 b/m4/ax_matio.m4
index d9092fc0b..bdde118ad 100644
--- a/m4/ax_matio.m4
+++ b/m4/ax_matio.m4
@@ -25,28 +25,28 @@ AC_ARG_WITH(matio, AC_HELP_STRING([--with-matio=DIR], [prefix to MATIO installat
   has_matio=yes
 
   if test "x$matio_prefix" != "x"; then
-    CFLAGS_MATIO="-I$withval/include"
+    CPPFLAGS_MATIO="-I$withval/include"
     LDFLAGS_MATIO="-L$withval/lib"
   else
-    CFLAGS_MATIO=""
+    CPPFLAGS_MATIO=""
     LDFLAGS_MATIO=""
   fi
 
-  ac_save_CFLAGS="$CFLAGS"
+  ac_save_CPPFLAGS="$CPPFLAGS"
   ac_save_LDFLAGS="$LDFLAGS"
 
   LIBADD_MATIO=""
-  CFLAGS="$CFLAGS_MATIO $CFLAGS"
+  CPPFLAGS="$CPPFLAGS_MATIO $CPPFLAGS"
   LDFLAGS="$LDFLAGS_MATIO $LDFLAGS"
 
   AC_CHECK_HEADER([matio.h], [], [has_matio=no])
   AC_CHECK_LIB([matio], [Mat_Open], [LIBADD_MATIO="-lmatio"], [has_matio=no])
 
-  CFLAGS="$ac_save_CFLAGS"
+  CPPFLAGS="$ac_save_CPPFLAGS"
   LDFLAGS="$ac_save_LDFLAGS"
   LIBS="$ac_save_LIBS"
 
-  AC_SUBST(CFLAGS_MATIO)
+  AC_SUBST(CPPFLAGS_MATIO)
   AC_SUBST(LIBADD_MATIO)
   AC_SUBST(LDFLAGS_MATIO)
 ])
diff --git a/mex/build/dynare_simul_.am b/mex/build/dynare_simul_.am
index bd9ce7c2e..91d0becb8 100644
--- a/mex/build/dynare_simul_.am
+++ b/mex/build/dynare_simul_.am
@@ -1,6 +1,6 @@
 noinst_PROGRAMS = dynare_simul_
 
-dynare_simul__CPPFLAGS = -I$(top_srcdir)/../../../dynare++/sylv/cc -I$(top_srcdir)/../../../dynare++/tl/cc -I$(top_srcdir)/../../../dynare++/kord -I$(top_srcdir)/../../sources $(CFLAGS_MATIO)
+dynare_simul__CPPFLAGS = -I$(top_srcdir)/../../../dynare++/sylv/cc -I$(top_srcdir)/../../../dynare++/tl/cc -I$(top_srcdir)/../../../dynare++/kord -I$(top_srcdir)/../../sources $(CPPFLAGS_MATIO)
 
 dynare_simul__CXXFLAGS = $(PTHREAD_CFLAGS)
 
diff --git a/mex/build/estimation.am b/mex/build/estimation.am
index 7482568e6..22b3dab9b 100644
--- a/mex/build/estimation.am
+++ b/mex/build/estimation.am
@@ -1,7 +1,7 @@
 noinst_PROGRAMS = logposterior logMHMCMCposterior
 
 # We use shared flags so that automake does not compile things two times
-CPPFLAGS += -I$(top_srcdir)/../../sources/estimation/libmat -I$(top_srcdir)/../../sources/estimation/utils $(CFLAGS_MATIO) $(BOOST_CPPFLAGS)
+CPPFLAGS += -I$(top_srcdir)/../../sources/estimation/libmat -I$(top_srcdir)/../../sources/estimation/utils $(CPPFLAGS_MATIO) $(BOOST_CPPFLAGS)
 LDFLAGS += $(LDFLAGS_MATIO) $(BOOST_LDFLAGS)
 LDADD = $(LIBADD_DLOPEN) $(LIBADD_MATIO)
 
diff --git a/mex/build/k_order_perturbation.am b/mex/build/k_order_perturbation.am
index c5c323929..1bc3d7750 100644
--- a/mex/build/k_order_perturbation.am
+++ b/mex/build/k_order_perturbation.am
@@ -1,8 +1,8 @@
 noinst_PROGRAMS = k_order_perturbation
 
-k_order_perturbation_CPPFLAGS = -I$(top_srcdir)/../../../dynare++/src -I$(top_srcdir)/../../../dynare++/kord -I$(top_srcdir)/../../../dynare++/tl/cc -I$(top_srcdir)/../../../dynare++/utils/cc -I$(top_srcdir)/../../../dynare++/sylv/cc -I$(top_srcdir)/../../../dynare++/integ/cc -I$(top_srcdir)/../../sources
+k_order_perturbation_CPPFLAGS = -I$(top_srcdir)/../../../dynare++/src -I$(top_srcdir)/../../../dynare++/kord -I$(top_srcdir)/../../../dynare++/tl/cc -I$(top_srcdir)/../../../dynare++/utils/cc -I$(top_srcdir)/../../../dynare++/sylv/cc -I$(top_srcdir)/../../../dynare++/integ/cc -I$(top_srcdir)/../../sources $(CPPFLAGS_MATIO)
 
-k_order_perturbation_CXXFLAGS = $(CFLAGS_MATIO) $(PTHREAD_CFLAGS)
+k_order_perturbation_CXXFLAGS = $(PTHREAD_CFLAGS)
 
 # libdynare++ must come before pthread
 k_order_perturbation_LDFLAGS = $(LDFLAGS_MATIO)
diff --git a/mex/build/octave/ms_sbvar/Makefile.am b/mex/build/octave/ms_sbvar/Makefile.am
index 30e2a99b0..544c8e975 100644
--- a/mex/build/octave/ms_sbvar/Makefile.am
+++ b/mex/build/octave/ms_sbvar/Makefile.am
@@ -2,8 +2,8 @@ EXEEXT = .mex
 include ../mex.am
 include ../../ms_sbvar.am
 
-ms_sbvar_command_line_CPPLAGS = $(MATIO_CFLAGS)
-ms_sbvar_create_init_file_CPPLAGS = $(MATIO_CFLAGS)
+ms_sbvar_command_line_CPPLAGS = $(MATIO_CPPFLAGS)
+ms_sbvar_create_init_file_CPPLAGS = $(MATIO_CPPFLAGS)
 
 ms_sbvar_command_line_LDFLAGS = $(LDFLAGS_MATIO)
 ms_sbvar_create_init_file_LDFLAGS = $(LDFLAGS_MATIO)