[Groonga-mysql-commit] mroonga/mroonga at 00d3ef7 [master] Find config.h from include paths instead of realtive path

Back to archive index

Kouhei Sutou null+****@clear*****
Mon Aug 26 16:48:51 JST 2013


Kouhei Sutou	2013-08-26 16:48:51 +0900 (Mon, 26 Aug 2013)

  New Revision: 00d3ef7329e4c758f86fa5d69d5942bb45830414
  https://github.com/mroonga/mroonga/commit/00d3ef7329e4c758f86fa5d69d5942bb45830414

  Message:
    Find config.h from include paths instead of realtive path

  Modified files:
    lib/Makefile.am
    lib/mrn_condition_converter.cpp
    lib/mrn_path_mapper.cpp

  Modified: lib/Makefile.am (+3 -2)
===================================================================
--- lib/Makefile.am    2013-08-26 13:45:47 +0900 (fe43300)
+++ lib/Makefile.am    2013-08-26 16:48:51 +0900 (d839836)
@@ -1,8 +1,9 @@
 AM_CPPFLAGS =					\
+	-I$(top_builddir)			\
+	-I$(top_srcdir)				\
 	$(MYSQL_INCLUDES)			\
 	$(GROONGA_CFLAGS)			\
-	$(MYSQL_VERSION_CFLAGS)			\
-	-I$(top_srcdir)
+	$(MYSQL_VERSION_CFLAGS)
 
 libmrn_need_mysql_la_CXXFLAGS = $(AM_CXXFLAGS) $(MYSQL_CFLAGS)
 

  Modified: lib/mrn_condition_converter.cpp (+1 -1)
===================================================================
--- lib/mrn_condition_converter.cpp    2013-08-26 13:45:47 +0900 (8030b51)
+++ lib/mrn_condition_converter.cpp    2013-08-26 16:48:51 +0900 (c292220)
@@ -18,7 +18,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#  include "../config.h"
+#  include <config.h>
 #endif
 
 #include "mrn_condition_converter.hpp"

  Modified: lib/mrn_path_mapper.cpp (+1 -1)
===================================================================
--- lib/mrn_path_mapper.cpp    2013-08-26 13:45:47 +0900 (fd0e81b)
+++ lib/mrn_path_mapper.cpp    2013-08-26 16:48:51 +0900 (e545865)
@@ -20,7 +20,7 @@
 */
 
 #ifdef HAVE_CONFIG_H
-#  include "config.h"
+#  include <config.h>
 #endif
 
 #include "mrn_path_mapper.hpp"
-------------- next part --------------
HTML����������������������������...
Download 



More information about the Groonga-mysql-commit mailing list
Back to archive index