diff options
Diffstat (limited to 'buildlib')
| -rw-r--r-- | buildlib/config.h.in | 6 | ||||
| -rw-r--r-- | buildlib/environment.mak.in | 2 | ||||
| -rw-r--r-- | buildlib/staticlibrary.mak | 3 | ||||
| -rw-r--r-- | buildlib/statvfs.h.in | 9 |
4 files changed, 20 insertions, 0 deletions
diff --git a/buildlib/config.h.in b/buildlib/config.h.in index f882ca25d..689549e65 100644 --- a/buildlib/config.h.in +++ b/buildlib/config.h.in @@ -23,6 +23,12 @@ /* Define if we have the X11 windowing system. */ #undef HAVE_X11 +/* Define if we have sys/vfs.h */ +#undef HAVE_VFS_H + +/* Define if we have sys/mount.h */ +#undef HAVE_MOUNT_H + /* Define if we have enabled pthread support */ #undef HAVE_PTHREAD diff --git a/buildlib/environment.mak.in b/buildlib/environment.mak.in index e7545bac8..12aaa7cba 100644 --- a/buildlib/environment.mak.in +++ b/buildlib/environment.mak.in @@ -14,6 +14,8 @@ LFLAGS+= @LDFLAGS@ LEFLAGS+= XLIBS:= @X_LIBS@ @X_PRE_LIBS@ @X11LIB@ @X_EXTRA_LIBS@ SOCKETLIBS:= @SOCKETLIBS@ +AR:=@AR@ +RANLIB:=@RANLIB@ # Dep generation - this only works for gnu stuff INLINEDEPFLAG = -MD diff --git a/buildlib/staticlibrary.mak b/buildlib/staticlibrary.mak index 998ca5bf2..0835fe8a0 100644 --- a/buildlib/staticlibrary.mak +++ b/buildlib/staticlibrary.mak @@ -39,6 +39,9 @@ $($(LOCAL)-LIB): $($(LOCAL)-HEADERS) $($(LOCAL)-OBJS) echo Building library $@ -rm $@ > /dev/null 2>&1 $(AR) cq $@ $(filter %.o,$^) +ifneq ($(words $(RANLIB)),0) + $(RANLIB) $@ +endif # Compilation rules vpath %.cc $(SUBDIRS) diff --git a/buildlib/statvfs.h.in b/buildlib/statvfs.h.in index 86b8c52cd..d0ec238ad 100644 --- a/buildlib/statvfs.h.in +++ b/buildlib/statvfs.h.in @@ -1,4 +1,13 @@ /* Compatibility for systems with out Single Unix Spec statvfs */ +#include <config.h> + +#ifdef HAVE_VFS_H #include <sys/vfs.h> +#endif + +#ifdef HAVE_MOUNT_H +#include <sys/param.h> +#include <sys/mount.h> +#endif #define statvfs statfs |