GNU file utilities

diff --git a/lib/Makefile.in b/lib/Makefile.in
index ae30a2df5a944130e4ac03106e6dc5c858bafbad..af3bf1c8ea51dda6b2e64e0c0bef7794c5029806 100644 (file)
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -49,7 +49,7 @@ fnmatch.h fsusage.h mountlist.h pathmax.h system.h $(SOURCES)
 all: libfu.a
 
 .c.o:
-       $(CC) -c $(CPPFLAGS) $(DEFS) -I$(srcdir) $(CFLAGS) $<
+       $(CC) -c $(CPPFLAGS) $(DEFS) -I.. -I$(srcdir) $(CFLAGS) $<
 
 install: all
 

diff --git a/lib/argmatch.c b/lib/argmatch.c
index f3f1a50d229c7b6472d11c8a5a19c43e9cf14527..bf1581aa34c60de9a701af279b5eccb030cae216 100644 (file)
--- a/lib/argmatch.c
+++ b/lib/argmatch.c
@@ -17,6 +17,17 @@
 
 /* Written by David MacKenzie <djm@ai.mit.edu> */
 
+#ifdef HAVE_CONFIG_H
+#if defined (CONFIG_BROKETS)
+/* We use <config.h> instead of "config.h" so that a compilation
+   using -I. -I will use ./config.h rather than /config.h
+   (which it would do because it found this file in ).  */
+#include <config.h>
+#else
+#include "config.h"
+#endif
+#endif
+
 #include <stdio.h>
 #ifdef STDC_HEADERS
 #include <string.h>

diff --git a/lib/backupfile.c b/lib/backupfile.c
index 670db0f5d521bd8d822c8edfee702398bd0e78ce..ddf3fa7894643362b3c0b8ac3d8e2d6cb0baf4f7 100644 (file)
--- a/lib/backupfile.c
+++ b/lib/backupfile.c
@@ -18,6 +18,17 @@
 /* David MacKenzie <djm@gnu.ai.mit.edu>.
    Some algorithms adapted from GNU Emacs. */
 
+#ifdef HAVE_CONFIG_H
+#if defined (CONFIG_BROKETS)
+/* We use <config.h> instead of "config.h" so that a compilation
+   using -I. -I will use ./config.h rather than /config.h
+   (which it would do because it found this file in ).  */
+#include <config.h>
+#else
+#include "config.h"
+#endif
+#endif
+
 #include <stdio.h>
 #include <ctype.h>
 #include <sys/types.h>

diff --git a/lib/dirname.c b/lib/dirname.c
index 5a92ce557ff6d6f08fc9e527ddbea90dea46752f..8e365ed928a05c763830786beea29808ca1a1fdd 100644 (file)
--- a/lib/dirname.c
+++ b/lib/dirname.c
@@ -15,6 +15,17 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
+#ifdef HAVE_CONFIG_H
+#if defined (CONFIG_BROKETS)
+/* We use <config.h> instead of "config.h" so that a compilation
+   using -I. -I will use ./config.h rather than /config.h
+   (which it would do because it found this file in ).  */
+#include <config.h>
+#else
+#include "config.h"
+#endif
+#endif
+
 #ifdef STDC_HEADERS
 #include <stdlib.h>
 #else

diff --git a/lib/fileblocks.c b/lib/fileblocks.c
index 23dee981502164ad20befcefaa0dbed4927e0a7c..fad39de13cab18634765e7b77b4ac6ffd3feeca5 100644 (file)
--- a/lib/fileblocks.c
+++ b/lib/fileblocks.c
@@ -17,6 +17,17 @@
 
 /* Written by Brian L. Matthews, blm@6sceng.UUCP. */
 \f
+#ifdef HAVE_CONFIG_H
+#if defined (CONFIG_BROKETS)
+/* We use <config.h> instead of "config.h" so that a compilation
+   using -I. -I will use ./config.h rather than /config.h
+   (which it would do because it found this file in ).  */
+#include <config.h>
+#else
+#include "config.h"
+#endif
+#endif
+
 #if !defined (HAVE_ST_BLOCKS) && !defined(_POSIX_SOURCE)
 #include <sys/types.h>
 #include <sys/param.h>

diff --git a/lib/fsusage.c b/lib/fsusage.c
index 2f1179b231fba35edcf1713196b87ed0be33a88b..28c54ac179cca15a92ee585c933d004d86cd535f 100644 (file)
--- a/lib/fsusage.c
+++ b/lib/fsusage.c
@@ -15,6 +15,17 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
+#ifdef HAVE_CONFIG_H
+#if defined (CONFIG_BROKETS)
+/* We use <config.h> instead of "config.h" so that a compilation
+   using -I. -I will use ./config.h rather than /config.h
+   (which it would do because it found this file in ).  */
+#include <config.h>
+#else
+#include "config.h"
+#endif
+#endif
+
 #include <sys/types.h>
 #include "fsusage.h"
 

diff --git a/lib/ftruncate.c b/lib/ftruncate.c
index 17d263d512144e9df9d97ae8aa497134f4551690..3bf53fa89f9622c1c48f0565431a6046f131b7bb 100644 (file)
--- a/lib/ftruncate.c
+++ b/lib/ftruncate.c
@@ -1,6 +1,17 @@
 /* ftruncate emulations that work on some System V's.
    This file is in the public domain. */
 
+#ifdef HAVE_CONFIG_H
+#if defined (CONFIG_BROKETS)
+/* We use <config.h> instead of "config.h" so that a compilation
+   using -I. -I will use ./config.h rather than /config.h
+   (which it would do because it found this file in ).  */
+#include <config.h>
+#else
+#include "config.h"
+#endif
+#endif
+
 #include <sys/types.h>
 #include <fcntl.h>
 

diff --git a/lib/getversion.c b/lib/getversion.c
index eca294599e4f374103751838977272c3ce56723d..0784edad965bbf2b090582523308b115cf34f2c1 100644 (file)
--- a/lib/getversion.c
+++ b/lib/getversion.c
@@ -17,6 +17,17 @@
 
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu> */
 
+#ifdef HAVE_CONFIG_H
+#if defined (CONFIG_BROKETS)
+/* We use <config.h> instead of "config.h" so that a compilation
+   using -I. -I will use ./config.h rather than /config.h
+   (which it would do because it found this file in ).  */
+#include <config.h>
+#else
+#include "config.h"
+#endif
+#endif
+
 #include "backupfile.h"
 
 #ifdef STDC_HEADERS

diff --git a/lib/idcache.c b/lib/idcache.c
index dd9c366b16191db9c2835d98b23f0fe0448a0567..5242366ac69e51bbe5f5eb9c5b2bc7fa08e9acff 100644 (file)
--- a/lib/idcache.c
+++ b/lib/idcache.c
@@ -15,6 +15,17 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
+#ifdef HAVE_CONFIG_H
+#if defined (CONFIG_BROKETS)
+/* We use <config.h> instead of "config.h" so that a compilation
+   using -I. -I will use ./config.h rather than /config.h
+   (which it would do because it found this file in ).  */
+#include <config.h>
+#else
+#include "config.h"
+#endif
+#endif
+
 #include <stdio.h>
 #include <sys/types.h>
 #include <pwd.h>

diff --git a/lib/isdir.c b/lib/isdir.c
index 439235f8e146df0f076c3023439d2f5c6c49bf73..76b79829d549e65370da2b608bb6c2799b2721ec 100644 (file)
--- a/lib/isdir.c
+++ b/lib/isdir.c
@@ -15,6 +15,17 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
+#ifdef HAVE_CONFIG_H
+#if defined (CONFIG_BROKETS)
+/* We use <config.h> instead of "config.h" so that a compilation
+   using -I. -I will use ./config.h rather than /config.h
+   (which it would do because it found this file in ).  */
+#include <config.h>
+#else
+#include "config.h"
+#endif
+#endif
+
 #include <sys/types.h>
 #include <sys/stat.h>
 

diff --git a/lib/makepath.c b/lib/makepath.c
index 7699c178df79fb2e89ec3a939478d9cf670d235b..be5f8c34718fbb45b7b276aa5890e6c271fbfc3a 100644 (file)
--- a/lib/makepath.c
+++ b/lib/makepath.c
@@ -18,6 +18,17 @@
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu> and
    Jim Meyering <meyering@cs.utexas.edu>.  */
 
+#ifdef HAVE_CONFIG_H
+#if defined (CONFIG_BROKETS)
+/* We use <config.h> instead of "config.h" so that a compilation
+   using -I. -I will use ./config.h rather than /config.h
+   (which it would do because it found this file in ).  */
+#include <config.h>
+#else
+#include "config.h"
+#endif
+#endif
+
 #ifdef __GNUC__
 #define alloca __builtin_alloca
 #else
@@ -32,6 +43,17 @@ char *alloca ();
 #endif
 #endif
 
+#ifdef HAVE_CONFIG_H
+#if defined (CONFIG_BROKETS)
+/* We use <config.h> instead of "config.h" so that a compilation
+   using -I. -I will use ./config.h rather than /config.h
+   (which it would do because it found this file in ).  */
+#include <config.h>
+#else
+#include "config.h"
+#endif
+#endif
+
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>

diff --git a/lib/mkdir.c b/lib/mkdir.c
index 68e6b6327a921c98c288058753c812d79dd2b59f..a5f6230344a5dc878a8f231c11ecd754158b6456 100644 (file)
--- a/lib/mkdir.c
+++ b/lib/mkdir.c
@@ -15,6 +15,17 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
+#ifdef HAVE_CONFIG_H
+#if defined (CONFIG_BROKETS)
+/* We use <config.h> instead of "config.h" so that a compilation
+   using -I. -I will use ./config.h rather than /config.h
+   (which it would do because it found this file in ).  */
+#include <config.h>
+#else
+#include "config.h"
+#endif
+#endif
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>

diff --git a/lib/modechange.c b/lib/modechange.c
index 978ab46d171a2ad7cade6d4114b82e3d8297715b..6b3c88e240e1f580b555cd3854532387574e08d2 100644 (file)
--- a/lib/modechange.c
+++ b/lib/modechange.c
@@ -24,6 +24,17 @@
    changing the mode of many files, this probably results in a
    performance gain. */
 
+#ifdef HAVE_CONFIG_H
+#if defined (CONFIG_BROKETS)
+/* We use <config.h> instead of "config.h" so that a compilation
+   using -I. -I will use ./config.h rather than /config.h
+   (which it would do because it found this file in ).  */
+#include <config.h>
+#else
+#include "config.h"
+#endif
+#endif
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include "modechange.h"

diff --git a/lib/mountlist.c b/lib/mountlist.c
index 4528c9e0dc9a34e522a80912485d297be5c41b75..55e79b12a7043aba9c50da69251d245230a9b924 100644 (file)
--- a/lib/mountlist.c
+++ b/lib/mountlist.c
@@ -15,6 +15,17 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
+#ifdef HAVE_CONFIG_H
+#if defined (CONFIG_BROKETS)
+/* We use <config.h> instead of "config.h" so that a compilation
+   using -I. -I will use ./config.h rather than /config.h
+   (which it would do because it found this file in ).  */
+#include <config.h>
+#else
+#include "config.h"
+#endif
+#endif
+
 #include <stdio.h>
 #include <sys/types.h>
 #include "mountlist.h"

diff --git a/lib/rename.c b/lib/rename.c
index 593cf31dad6a0e193e86f8b432271473f22c9fc1..ca778e9abece4b0fcc7b4ea81ee20b87bd3adec3 100644 (file)
--- a/lib/rename.c
+++ b/lib/rename.c
@@ -15,6 +15,17 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
+#ifdef HAVE_CONFIG_H
+#if defined (CONFIG_BROKETS)
+/* We use <config.h> instead of "config.h" so that a compilation
+   using -I. -I will use ./config.h rather than /config.h
+   (which it would do because it found this file in ).  */
+#include <config.h>
+#else
+#include "config.h"
+#endif
+#endif
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>

diff --git a/lib/savedir.c b/lib/savedir.c
index d89adc0a09a5ab48cf2e9cfcd998e5122e77c214..378fb4774cf32495e0ee8aa4e9cac7a18d3285c4 100644 (file)
--- a/lib/savedir.c
+++ b/lib/savedir.c
@@ -17,6 +17,17 @@
 
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>. */
 
+#ifdef HAVE_CONFIG_H
+#if defined (CONFIG_BROKETS)
+/* We use <config.h> instead of "config.h" so that a compilation
+   using -I. -I will use ./config.h rather than /config.h
+   (which it would do because it found this file in ).  */
+#include <config.h>
+#else
+#include "config.h"
+#endif
+#endif
+
 #include <sys/types.h>
 
 #ifdef HAVE_UNISTD_H

diff --git a/lib/strdup.c b/lib/strdup.c
index b137db2d954b5396e8f2bcc1e71e12c130414dc0..40b2df6037bb4d175528dac5269e702addd5295f 100644 (file)
--- a/lib/strdup.c
+++ b/lib/strdup.c
@@ -15,6 +15,17 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
+#ifdef HAVE_CONFIG_H
+#if defined (CONFIG_BROKETS)
+/* We use <config.h> instead of "config.h" so that a compilation
+   using -I. -I will use ./config.h rather than /config.h
+   (which it would do because it found this file in ).  */
+#include <config.h>
+#else
+#include "config.h"
+#endif
+#endif
+
 #ifdef STDC_HEADERS
 #include <string.h>
 #include <stdlib.h>

diff --git a/lib/stripslash.c b/lib/stripslash.c
index 2971d4ced00f3e618f7ee5ecefd60be7413ea3a7..bccbdeb0a2f6340ce36265e18449128eb6331931 100644 (file)
--- a/lib/stripslash.c
+++ b/lib/stripslash.c
@@ -15,6 +15,17 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
+#ifdef HAVE_CONFIG_H
+#if defined (CONFIG_BROKETS)
+/* We use <config.h> instead of "config.h" so that a compilation
+   using -I. -I will use ./config.h rather than /config.h
+   (which it would do because it found this file in ).  */
+#include <config.h>
+#else
+#include "config.h"
+#endif
+#endif
+
 #if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
 #include <string.h>
 #else

diff --git a/lib/userspec.c b/lib/userspec.c
index 44d7d91744d68e89625015aa1c101562e1a78df6..8c1e9ec8ea0680367599ac8945322f216ac05644 100644 (file)
--- a/lib/userspec.c
+++ b/lib/userspec.c
@@ -17,6 +17,17 @@
 
 /* Written by David MacKenzie <djm@gnu.ai.mit.edu>.  */
 \f
+#ifdef HAVE_CONFIG_H
+#if defined (CONFIG_BROKETS)
+/* We use <config.h> instead of "config.h" so that a compilation
+   using -I. -I will use ./config.h rather than /config.h
+   (which it would do because it found this file in ).  */
+#include <config.h>
+#else
+#include "config.h"
+#endif
+#endif
+
 #include <stdio.h>
 #include <sys/types.h>
 #include <pwd.h>

diff --git a/lib/xstrdup.c b/lib/xstrdup.c
index 9588bc78d19a3ec676f541d88e64bbd7b9886e7f..d422fcaddf81c4ff6aa46252c2f3c3d81e036301 100644 (file)
--- a/lib/xstrdup.c
+++ b/lib/xstrdup.c
@@ -15,6 +15,17 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
+#ifdef HAVE_CONFIG_H
+#if defined (CONFIG_BROKETS)
+/* We use <config.h> instead of "config.h" so that a compilation
+   using -I. -I will use ./config.h rather than /config.h
+   (which it would do because it found this file in ).  */
+#include <config.h>
+#else
+#include "config.h"
+#endif
+#endif
+
 #if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
 #include <string.h>
 #else

diff --git a/lib/yesno.c b/lib/yesno.c
index a705da732e2d4e7453099de05155f5bd142c66c0..6eca9dd5980dab261f10e8fb437ede18b8b2de8c 100644 (file)
--- a/lib/yesno.c
+++ b/lib/yesno.c
@@ -15,6 +15,17 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
+#ifdef HAVE_CONFIG_H
+#if defined (CONFIG_BROKETS)
+/* We use <config.h> instead of "config.h" so that a compilation
+   using -I. -I will use ./config.h rather than /config.h
+   (which it would do because it found this file in ).  */
+#include <config.h>
+#else
+#include "config.h"
+#endif
+#endif
+
 #include <stdio.h>
 
 /* Read one line from standard input