better check for libcif++

GNUmakefile.in

@@ -25,9 +25,10 @@
 firstTarget: all
 firstTarget: all
 
 
 CXX					= @CXX@
 CXX					= @CXX@
-CXXFLAGS			= @CXXFLAGS@ @CPPFLAGS@ @BOOST_CPPFLAGS@ @PTHREAD_CFLAGS@
+CXXFLAGS			= @CXXFLAGS@ @CPPFLAGS@ @BOOST_CPPFLAGS@ @PTHREAD_CFLAGS@ @CIFPP_CFLAGS@
 LDFLAGS				= @LDFLAGS@ @BOOST_LDFLAGS@ @PTHREAD_CFLAGS@
 LDFLAGS				= @LDFLAGS@ @BOOST_LDFLAGS@ @PTHREAD_CFLAGS@
 LIBS				= @LIBS@ \
 LIBS				= @LIBS@ \
+					  @CIFPP_LIBS@ \
 					  @BOOST_IOSTREAMS_LIB@ \
 					  @BOOST_IOSTREAMS_LIB@ \
 					  @BOOST_PROGRAM_OPTIONS_LIB@ \
 					  @BOOST_PROGRAM_OPTIONS_LIB@ \
 					  @BOOST_DATE_TIME_LIB@
 					  @BOOST_DATE_TIME_LIB@
@@ -72,7 +73,6 @@ endif
 
 
 MRC					= @MRC@
 MRC					= @MRC@
 USE_RSRC			= @USE_RSRC@
 USE_RSRC			= @USE_RSRC@
-CIFPP_RSRC			= $(DATADIR)
 
 
 # targets
 # targets
 
 
@@ -97,7 +97,7 @@ COMMON_OBJECTS = pr-main.o
 $(OBJDIR)/pr-main.o: src/revision.hpp
 $(OBJDIR)/pr-main.o: src/revision.hpp
 
 
 ifneq "$(USE_RSRC)" "0"
 ifneq "$(USE_RSRC)" "0"
-COMMON_RSRC = @CIFPP_RSRC@/dictionaries
+COMMON_RSRC = $(DATADIR)/dictionaries
 endif
 endif
 
 
 # The program rules
 # The program rules
@@ -144,12 +144,12 @@ REVISION_FILE = version-info-$(REVISION).txt
 $(REVISION_FILE): $(OBJDIR) src
 $(REVISION_FILE): $(OBJDIR) src
 	rm -f version-info-*.txt
 	rm -f version-info-*.txt
 	git describe --match=build --dirty > $@
 	git describe --match=build --dirty > $@
-	git log --pretty=medium --date=iso8601 -1 >> $@
+	@ git log --pretty=medium --date=iso8601 -1 >> $@
 
 
 src/revision.hpp: $(REVISION_FILE)
 src/revision.hpp: $(REVISION_FILE)
-	echo 'const char kRevision[] = R"(' > $@
-	cat $? >> $@
-	echo ')";' >> $@
+	@ echo 'const char kRevision[] = R"(' > $@
+	@ cat $? >> $@
+	@ echo ')";' >> $@
 
 
 rsrc:
 rsrc:
 	@ mkdir -p $@
 	@ mkdir -p $@

configure.ac

@@ -74,17 +74,20 @@ AC_ARG_WITH([cif++],
 	AS_HELP_STRING([--with-cif++=@<:@location@:>@],
 	AS_HELP_STRING([--with-cif++=@<:@location@:>@],
 		[Use the cif++ library as specified.]),
 		[Use the cif++ library as specified.]),
 		[
 		[
-			CPPFLAGS="$CPPFLAGS -I ${withval}/include"
-			CXXFLAGS="$CXXFLAGS -I ${withval}/include"
-			LDFLAGS="$LDFLAGS -L${withval}/.libs"
-			LIBS="$LIBS -lcif++"
-			AC_SUBST([CIFPP_RSRC], [${withval}/rsrc]) 
-			AC_SUBST([CIFPP_LIB], [${withval}/.libs/libcif++.la]) 
+			dnl AC_SUBST([CIFPP_CFLAGS], ["-I ${withval}/include"])
+			dnl AC_SUBST([CIFPP_LIBS], ["-L${withval}/.libs -lcif++"])
+
+			CIFPP_CFLAGS="-I ${withval}/include"
+			CIFPP_LIBS="-L${withval}/.libs -lcif++"
+
+			AC_SUBST([CIFPP_CFLAGS], [$CIFPP_CFLAGS])
+			AC_SUBST([CIFPP_LIBS], [$CIFPP_LIBS])
 		])
 		])
 
 
-AX_CHECK_LIBRARY([LIBCIFPP], [cif++/Config.hpp], [cif++],
-	[],
-	[AC_MSG_ERROR([libcif++ not found - cannot continue])])
+AS_IF([test "x$CIFPP_LIBS" = "x"], [
+	AC_PATH_PROG([PKG_CONFIG], [pkg-config])
+	AX_PKG_CHECK_MODULES([CIFPP], [libcif++], [], [], [AC_MSG_ERROR([the required package libcif++ is not installed])])
+])
 
 
 AX_CHECK_LIBRARY([LIBZ], [zlib.h], [z],
 AX_CHECK_LIBRARY([LIBZ], [zlib.h], [z],
 				 [ LIBS="$LIBS -lz" ],
 				 [ LIBS="$LIBS -lz" ],