Log Message:
-----------
autotools: check for libuuid
Modified Files:
--------------
unionfs-utils:
COPYING (r1.1 -> r1.2)
ChangeLog (r1.5 -> r1.6)
INSTALL (r1.1 -> r1.2)
Makefile.am (r1.1 -> r1.2)
config.h.in (r1.1 -> r1.2)
configure.ac (r1.1 -> r1.2)
ctl.c (r1.1 -> r1.2)
dbg.c (r1.1 -> r1.2)
imap.c (r1.1 -> r1.2)
unionctl.c (r1.6 -> r1.7)
unionctl.h (r1.4 -> r1.5)
uniondbg.h (r1.2 -> r1.3)
unionimap.c (r1.4 -> r1.5)
unionimap.h (r1.5 -> r1.6)
Revision Data
-------------
Index: dbg.c
===================================================================
RCS file: /home/cvs/unionfs/unionfs-utils/dbg.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -Ldbg.c -Ldbg.c -u -d -b -B -p -r1.1 -r1.2
--- dbg.c
+++ dbg.c
@@ -16,21 +16,8 @@
* This Copyright notice must be kept intact and distributed with all sources.
*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <fcntl.h>
-#include <asm/ioctl.h>
-#include <errno.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <sys/mount.h>
-#include <sys/types.h>
-#include <uuid/uuid.h>
#include "unionfs.h"
#include "uniondbg.h"
-
int unionfs_debug_value(int fd, int *val, unsigned int flag);
Index: ctl.c
===================================================================
RCS file: /home/cvs/unionfs/unionfs-utils/ctl.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lctl.c -Lctl.c -u -d -b -B -p -r1.1 -r1.2
--- ctl.c
+++ ctl.c
@@ -16,18 +16,6 @@
* This Copyright notice must be kept intact and distributed with all sources.
*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <fcntl.h>
-#include <asm/ioctl.h>
-#include <errno.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <sys/mount.h>
-#include <sys/types.h>
-#include <uuid/uuid.h>
#include "unionfs.h"
#include "unionctl.h"
Index: unionimap.h
===================================================================
RCS file: /home/cvs/unionfs/unionfs-utils/unionimap.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -Lunionimap.h -Lunionimap.h -u -d -b -B -p -r1.5 -r1.6
--- unionimap.h
+++ unionimap.h
@@ -24,15 +24,19 @@
#include "config.h"
#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
+#include <string.h>
#include <errno.h>
-#include <ctype.h>
#include <fcntl.h>
#include <sys/statfs.h>
#include <sys/stat.h>
+
+#ifdef HAVE_SYS_IOCTL_H
+ #include <sys/ioctl.h>
+#endif
+
+#if defined HAVE_LIBUUID && defined HAVE_UUID_UUID_H
+
#include <uuid/uuid.h>
-#include <string.h>
/*
* Defines,structs,and functions for persistent inodes used by kernel and user
@@ -86,7 +90,9 @@ int unionfs_check_if_entry_exists(int fw
int unionfs_create_reversemap(char *filename, char *path, char *forwardmap);
int unionfs_dump_map(char *filename, int debug_level);
-#endif
+#endif /* HAVE_LIBUUID */
+
+#endif /* __UNIONIMAP_H_ */
/*
*
* vim:shiftwidth=8
Index: unionctl.c
===================================================================
RCS file: /home/cvs/unionfs/unionfs-utils/unionctl.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -Lunionctl.c -Lunionctl.c -u -d -b -B -p -r1.6 -r1.7
--- unionctl.c
+++ unionctl.c
@@ -19,6 +19,9 @@
* $Id$
*/
+
+#include <stdio.h>
+#include <stdlib.h>
#include "unionctl.h"
static const char *progname;
Index: unionimap.c
===================================================================
RCS file: /home/cvs/unionfs/unionfs-utils/unionimap.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lunionimap.c -Lunionimap.c -u -d -b -B -p -r1.4 -r1.5
--- unionimap.c
+++ unionimap.c
@@ -19,6 +19,9 @@
* $Id$
*/
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
#include "unionimap.h"
/**
@@ -49,6 +52,9 @@ int main(int argc, char **argv)
int cflag = 0, aflag = 0, dflag = 0;
int err = 0;
char *avalue = NULL;
+
+#if defined HAVE_LIBUUID && defined HAVE_UUID_UUID_H
+
if (argc < 2) {
print_usage();
err = -EINVAL;
@@ -122,6 +128,10 @@ int main(int argc, char **argv)
if (err)
goto out;
}
+
+#else /* No LIBUUID */
+ fprintf(stderr, "unionimap failed. no lubuuid present.\n" );
+#endif
out:
free(avalue);
return err;
Index: configure.ac
===================================================================
RCS file: /home/cvs/unionfs/unionfs-utils/configure.ac,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lconfigure.ac -Lconfigure.ac -u -d -b -B -p -r1.1 -r1.2
--- configure.ac
+++ configure.ac
@@ -19,7 +19,16 @@ AC_CHECK_LIB([uuid], [uuid_generate])
# Checks for header files.
AC_HEADER_STDC
-AC_CHECK_HEADERS([fcntl.h limits.h stdlib.h string.h sys/ioctl.h sys/mount.h
sys/statfs.h unistd.h])
+AC_CHECK_HEADERS([\
+ fcntl.h \
+ errno.h \
+ limits.h \
+ ctype.h \
+ sys/ioctl.h \
+ sys/mount.h \
+ sys/statfs.h \
+ uuid/uuid.h \
+])
# Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
@@ -30,11 +39,6 @@ AC_TYPE_UID_T
# Checks for library functions.
AC_PROG_GCC_TRADITIONAL
-AC_HEADER_MAJOR
-AC_FUNC_MALLOC
-AC_FUNC_MEMCMP
-AC_FUNC_REALLOC
-AC_FUNC_STAT
AC_CHECK_FUNCS([memset realpath strchr strdup strerror strrchr strtol])
AC_CONFIG_FILES([Makefile])
Index: imap.c
===================================================================
RCS file: /home/cvs/unionfs/unionfs-utils/imap.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -Limap.c -Limap.c -u -d -b -B -p -r1.1 -r1.2
--- imap.c
+++ imap.c
@@ -16,21 +16,12 @@
* This Copyright notice must be kept intact and distributed with all sources.
*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <fcntl.h>
-#include <asm/ioctl.h>
-#include <errno.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <sys/mount.h>
-#include <sys/types.h>
-#include <uuid/uuid.h>
#include "unionfs.h"
#include "unionimap.h"
+#if defined HAVE_LIBUUID && defined HAVE_UUID_UUID_H
+
+
extern int mkfsid(char *path, fsid_t * fsid);
/**
@@ -423,3 +414,4 @@ out:
return err;
}
+#endif /* HAVE_LIBUUID */
Index: COPYING
===================================================================
RCS file: /home/cvs/unionfs/unionfs-utils/COPYING,v
retrieving revision 1.1
retrieving revision 1.2
diff -LCOPYING -LCOPYING -u -d -b -B -p -r1.1 -r1.2
--- COPYING
+++ COPYING
@@ -2,7 +2,7 @@
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -305,7 +305,7 @@ the "copyright" line and a pointer to wh
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA
Also add information on how to contact you by electronic and paper mail.
Index: uniondbg.h
===================================================================
RCS file: /home/cvs/unionfs/unionfs-utils/uniondbg.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -Luniondbg.h -Luniondbg.h -u -d -b -B -p -r1.2 -r1.3
--- uniondbg.h
+++ uniondbg.h
@@ -19,13 +19,18 @@
#ifndef __UNIONDBG_H_
#define __UNIONDBG_H_
-#include <sys/ioctl.h>
+#include "config.h"
#include <fcntl.h>
+#include <errno.h>
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
#include <stdio.h>
#include <sys/types.h>
+
+#ifdef HAVE_SYS_IOCTL_H
+ #include <sys/ioctl.h>
+#endif
int unionfs_debug_get_value(int fd, int *val);
int unionfs_debug_set_value(int fd, int *val);
Index: ChangeLog
===================================================================
RCS file: /home/cvs/unionfs/unionfs-utils/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -LChangeLog -LChangeLog -u -d -b -B -p -r1.5 -r1.6
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,8 @@
+2006-09-29 Yiannis Pericleous <[EMAIL PROTECTED]>
+ * unionimap : Added checks for libuuid
+ * configure.ac : Removed some unnecessary checks
+ * config.h.in : Removed from CVS, since unneeded
+
2006-09-27 Yiannis Pericleous <[EMAIL PROTECTED]>
* Autotools : added initial autotool scripts
(configure.ac, Makefile.am, config.h.in)
Index: config.h.in
===================================================================
RCS file: /home/cvs/unionfs/unionfs-utils/config.h.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -Lconfig.h.in -Lconfig.h.in -u -d -b -B -p -r1.1 -r1.2
--- config.h.in
+++ config.h.in
@@ -1,8 +1,14 @@
/* config.h.in. Generated from configure.ac by autoheader. */
+/* Define to 1 if you have the <ctype.h> header file. */
+#undef HAVE_CTYPE_H
+
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
+/* Define to 1 if you have the <errno.h> header file. */
+#undef HAVE_ERRNO_H
+
/* Define to 1 if you have the <fcntl.h> header file. */
#undef HAVE_FCNTL_H
@@ -15,20 +21,12 @@
/* Define to 1 if you have the <limits.h> header file. */
#undef HAVE_LIMITS_H
-/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
- to 0 otherwise. */
-#undef HAVE_MALLOC
-
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
/* Define to 1 if you have the `memset' function. */
#undef HAVE_MEMSET
-/* Define to 1 if your system has a GNU libc compatible `realloc' function,
- and to 0 otherwise. */
-#undef HAVE_REALLOC
-
/* Define to 1 if you have the `realpath' function. */
#undef HAVE_REALPATH
@@ -81,18 +79,13 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
+/* Define to 1 if you have the <uuid/uuid.h> header file. */
+#undef HAVE_UUID_UUID_H
+
/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
slash. */
#undef LSTAT_FOLLOWS_SLASHED_SYMLINK
-/* Define to 1 if `major', `minor', and `makedev' are declared in <mkdev.h>.
- */
-#undef MAJOR_IN_MKDEV
-
-/* Define to 1 if `major', `minor', and `makedev' are declared in
- <sysmacros.h>. */
-#undef MAJOR_IN_SYSMACROS
-
/* Name of package */
#undef PACKAGE
@@ -129,14 +122,8 @@
#undef inline
#endif
-/* Define to rpl_malloc if the replacement function should be used. */
-#undef malloc
-
/* Define to `long' if <sys/types.h> does not define. */
#undef off_t
-
-/* Define to rpl_realloc if the replacement function should be used. */
-#undef realloc
/* Define to `unsigned' if <sys/types.h> does not define. */
#undef size_t
Index: unionctl.h
===================================================================
RCS file: /home/cvs/unionfs/unionfs-utils/unionctl.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lunionctl.h -Lunionctl.h -u -d -b -B -p -r1.4 -r1.5
--- unionctl.h
+++ unionctl.h
@@ -20,19 +20,21 @@
#ifndef __UNIIONCTL_H_
#define __UNIONCTL_H_
-#include <sys/ioctl.h>
+#include "config.h"
+#include <stdio.h>
+#include <stdlib.h>
#include <sys/mount.h>
#include <fcntl.h>
-#include <stdlib.h>
-#include <unistd.h>
#include <limits.h>
#include <string.h>
-#include <stdio.h>
#include <errno.h>
#include <sys/types.h>
-
+#include <sys/stat.h>
#include "unionfs.h"
-#include "config.h"
+
+#ifdef HAVE_SYS_IOCTL_H
+ #include <sys/ioctl.h>
+#endif
#define MAY_READ 4
#define MAY_WRITE 2
Index: Makefile.am
===================================================================
RCS file: /home/cvs/unionfs/unionfs-utils/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -LMakefile.am -LMakefile.am -u -d -b -B -p -r1.1 -r1.2
--- Makefile.am
+++ Makefile.am
@@ -1,7 +1,7 @@
bin_PROGRAMS = uniondbg unionctl unionimap
-uniondbg_SOURCES = dbg.c uniondbg.c usercommon.c
-unionctl_SOURCES = ctl.c unionctl.c usercommon.c
-unionimap_SOURCES = imap.c unionimap.c usercommon.c
+uniondbg_SOURCES = dbg.c uniondbg.c usercommon.c unionfs.h uniondbg.h
+unionctl_SOURCES = ctl.c unionctl.c usercommon.c unionfs.h unionctl.h
+unionimap_SOURCES = imap.c unionimap.c usercommon.c unionfs.h unionimap.h
unionctl_CFLAGS = $(AM_CFLAGS)
uniondbg_CFLAGS = $(AM_CFLAGS)
unionimap_CFLAGS = $(AM_CFLAGS)
Index: INSTALL
===================================================================
RCS file: /home/cvs/unionfs/unionfs-utils/INSTALL,v
retrieving revision 1.1
retrieving revision 1.2
diff -LINSTALL -LINSTALL -u -d -b -B -p -r1.1 -r1.2
--- INSTALL
+++ INSTALL
@@ -1,7 +1,7 @@
Installation Instructions
*************************
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004 Free
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
Software Foundation, Inc.
This file is free documentation; the Free Software Foundation gives
@@ -102,16 +102,16 @@ for another architecture.
Installation Names
==================
-By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc. You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PREFIX'.
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
-give `configure' the option `--exec-prefix=PREFIX', the package will
-use PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
In addition, if you use an unusual directory layout you can give
options like `--bindir=DIR' to specify different values for particular
@@ -159,7 +159,7 @@ where SYSTEM can have one of these forms
need to know the machine type.
If you are _building_ compiler tools for cross-compiling, you should
-use the `--target=TYPE' option to select the type of system they will
+use the option `--target=TYPE' to select the type of system they will
produce code for.
If you want to _use_ a cross compiler, that generates code for a
@@ -189,8 +189,13 @@ them in the `configure' command line, us
./configure CC=/usr/local2/bin/gcc
-will cause the specified gcc to be used as the C compiler (unless it is
-overridden in the site shell script).
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script). Here is a another example:
+
+ /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
+configuration-related scripts to be executed by `/bin/bash'.
`configure' Invocation
======================
_______________________________________________
unionfs-cvs mailing list
[email protected]
http://www.fsl.cs.sunysb.edu/mailman/listinfo/unionfs-cvs
