Fix <jni.h> detection on Mac OS X

.gitignore

@@ -11,6 +11,10 @@ autom4te.cache
 Makefile
 config.log
 config.status
+config.guess
+config.sub
+install-sh
+ltmain.sh
 nacl/nacl-20110221/build
 nacl/naclinc.txt
 nacl/nacllib.txt

Makefile.in

@@ -12,7 +12,7 @@ OBJS=	$(SRCS:.c=.o)
 HDRS=	Makefile serval.h sqlite-amalgamation-3070900/sqlite3.h sha2.h rhizome.h
 
 LDFLAGS=@LDFLAGS@
-CFLAGS=	@CFLAGS@
+CFLAGS=	@CPPFLAGS@ @CFLAGS@
 DEFS=	@DEFS@
 
 all:	serval.c dna libservald.so

configure.in

@@ -1,6 +1,9 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(dna.c)
 
+dnl Set $host_os, which is needed by javac detection.
+AC_CANONICAL_SYSTEM
+
 dnl Check for programs.
 AC_PROG_CC
 
@@ -13,7 +16,7 @@ dnl Check for JNI includes, keep going if not present.
 pushdef([AC_MSG_ERROR], defn([AC_MSG_WARN]))
 AC_JNI_INCLUDE_DIR
 for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS; do
-  CFLAGS="$CFLAGS -I$JNI_INCLUDE_DIR"
+  CPPFLAGS="$CPPFLAGS -I$JNI_INCLUDE_DIR"
 done
 popdef([AC_MSG_ERROR])