From: Steinar H. Gunderson Date: Sun, 3 Feb 2013 15:06:35 +0000 (+0100) Subject: Use autoconf defaults for CXX and CXXFLAGS. X-Git-Tag: 1.0~122 X-Git-Url: https://git.sesse.net/?p=movit;a=commitdiff_plain;h=07f8e190c12f4b7883f7891b0c5b03d361cd97fb;hp=d41e82b7cc456c945dbc460b2ffdc13a80f6505f;ds=sidebyside Use autoconf defaults for CXX and CXXFLAGS. --- diff --git a/Makefile.in b/Makefile.in index d717216..13fb6f9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -7,9 +7,9 @@ libdir = @libdir@ datarootdir = @datarootdir@ datadir = @datadir@ -CC=gcc -CXX=g++ -CXXFLAGS=-Wall -g -I$(GTEST_DIR)/include @Eigen3_CFLAGS@ @GLEW_CFLAGS@ +CC=@CC@ +CXX=@CXX@ +CXXFLAGS=-Wall @CXXFLAGS@ -I$(GTEST_DIR)/include @Eigen3_CFLAGS@ @GLEW_CFLAGS@ LDFLAGS=@GLEW_LIBS@ @SDL_LIBS@ DEMO_LDFLAGS=@SDL_image_LIBS@ -lrt -lpthread @libpng_LIBS@ RANLIB=ranlib diff --git a/configure.ac b/configure.ac index f6b2e1d..f044a17 100644 --- a/configure.ac +++ b/configure.ac @@ -2,6 +2,7 @@ AC_INIT(movit, git) AC_CONFIG_SRCDIR(effect.cpp) +AC_PROG_CC AC_PROG_CXX PKG_CHECK_MODULES([Eigen3], [eigen3]) PKG_CHECK_MODULES([GLEW], [glew])