AM_CPPFLAGS and CPPFLAGS are used both during build, so no need to use merge them together in configure. also move the -I$(xx) stuff into Makefile* to avoid shell expansion issues. git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14269 67ed7778-7388-44ab-90cf-0a291f65f57c