From c66781ed4d8beb611a1155be540cffb3df7ce146 Mon Sep 17 00:00:00 2001
From: Thomas White <taw@physics.org>
Date: Tue, 27 Apr 2021 13:12:09 +0200
Subject: Rename libcrystfel's config.h to libcrystfel-config.h

This removes the big potential for confusion, which has happened several
times (see e.g. 095cbebaf6).  It also fixes in-tree builds with CMake
(but seriously, always use out-of-tree builds).

Fixes #2.
---
 libcrystfel/src/indexers/asdf.c        | 4 +---
 libcrystfel/src/indexers/dirax.c       | 5 +----
 libcrystfel/src/indexers/felix.c       | 5 +----
 libcrystfel/src/indexers/fromfile.c    | 2 ++
 libcrystfel/src/indexers/mosflm.c      | 5 +----
 libcrystfel/src/indexers/pinkindexer.c | 4 +---
 libcrystfel/src/indexers/taketwo.c     | 4 +---
 libcrystfel/src/indexers/xds.c         | 5 +----
 libcrystfel/src/indexers/xgandalf.c    | 4 +---
 9 files changed, 10 insertions(+), 28 deletions(-)

(limited to 'libcrystfel/src/indexers')

diff --git a/libcrystfel/src/indexers/asdf.c b/libcrystfel/src/indexers/asdf.c
index 0c57f9f0..a8943688 100644
--- a/libcrystfel/src/indexers/asdf.c
+++ b/libcrystfel/src/indexers/asdf.c
@@ -28,9 +28,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <libcrystfel-config.h>
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/libcrystfel/src/indexers/dirax.c b/libcrystfel/src/indexers/dirax.c
index 4b59f6cb..ef90a3f7 100644
--- a/libcrystfel/src/indexers/dirax.c
+++ b/libcrystfel/src/indexers/dirax.c
@@ -26,10 +26,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
+#include <libcrystfel-config.h>
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/libcrystfel/src/indexers/felix.c b/libcrystfel/src/indexers/felix.c
index a02f146f..dcd50613 100644
--- a/libcrystfel/src/indexers/felix.c
+++ b/libcrystfel/src/indexers/felix.c
@@ -27,10 +27,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
+#include <libcrystfel-config.h>
 
 /** \file felix.h */
 
diff --git a/libcrystfel/src/indexers/fromfile.c b/libcrystfel/src/indexers/fromfile.c
index 1f3cc0da..9a99b242 100644
--- a/libcrystfel/src/indexers/fromfile.c
+++ b/libcrystfel/src/indexers/fromfile.c
@@ -29,6 +29,8 @@
  *
  */
 
+#include <libcrystfel-config.h>
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
diff --git a/libcrystfel/src/indexers/mosflm.c b/libcrystfel/src/indexers/mosflm.c
index b0e0b121..5d107234 100644
--- a/libcrystfel/src/indexers/mosflm.c
+++ b/libcrystfel/src/indexers/mosflm.c
@@ -54,10 +54,7 @@
  *  worth another look at the documentation.
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
+#include <libcrystfel-config.h>
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/libcrystfel/src/indexers/pinkindexer.c b/libcrystfel/src/indexers/pinkindexer.c
index 5cb979a9..7da44f73 100644
--- a/libcrystfel/src/indexers/pinkindexer.c
+++ b/libcrystfel/src/indexers/pinkindexer.c
@@ -27,9 +27,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <libcrystfel-config.h>
 
 #include "pinkindexer.h"
 
diff --git a/libcrystfel/src/indexers/taketwo.c b/libcrystfel/src/indexers/taketwo.c
index 1bccf1e0..4b481e93 100644
--- a/libcrystfel/src/indexers/taketwo.c
+++ b/libcrystfel/src/indexers/taketwo.c
@@ -86,9 +86,7 @@
  * * Clean up the mess (cleanup_taketwo_obs_vecs())
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <libcrystfel-config.h>
 
 #include <gsl/gsl_matrix.h>
 #include <gsl/gsl_blas.h>
diff --git a/libcrystfel/src/indexers/xds.c b/libcrystfel/src/indexers/xds.c
index 3b2f2b87..3936f791 100644
--- a/libcrystfel/src/indexers/xds.c
+++ b/libcrystfel/src/indexers/xds.c
@@ -28,10 +28,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
+#include <libcrystfel-config.h>
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/libcrystfel/src/indexers/xgandalf.c b/libcrystfel/src/indexers/xgandalf.c
index 6b09f65c..ada0507a 100644
--- a/libcrystfel/src/indexers/xgandalf.c
+++ b/libcrystfel/src/indexers/xgandalf.c
@@ -26,9 +26,7 @@
  *
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include <libcrystfel-config.h>
 
 #include "xgandalf.h"
 
-- 
cgit v1.2.3