diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2010-05-05 01:00:39 +0200 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2010-05-05 01:00:39 +0200 |
| commit | a78d3c405b8c65caa847d98dff71584b6e20203c (patch) | |
| tree | f8ddb300e90ce13f932e25f93c8e607176ba526b | |
| parent | ad76f672858d3c566035eee6390382d717775b3b (diff) | |
| download | patch-a78d3c405b8c65caa847d98dff71584b6e20203c.tar.gz | |
Use the gnulib mkdir module
* bootstrap.conf: Use the gnulib mkdir module.
* m4/mkdir.m4: Delete.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | bootstrap.conf | 1 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | m4/mkdir.m4 | 40 | ||||
| -rw-r--r-- | src/common.h | 5 |
5 files changed, 6 insertions, 46 deletions
@@ -1,3 +1,8 @@ +2009-05-05 Andreas Gruenbacher <agruen@suse.de> + + * bootstrap.conf: Use the gnulib mkdir module. + * m4/mkdir.m4: Delete. + 2010-05-04 Eric Blake <eblake@redhat.com> * src/pch.c (includes): Add <io.h> for setmode. diff --git a/bootstrap.conf b/bootstrap.conf index 2e2c1df..846d1ef 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -38,6 +38,7 @@ lstat malloc memchr minmax +mkdir quotearg readlink realloc diff --git a/configure.ac b/configure.ac index d59dca2..3b2e578 100644 --- a/configure.ac +++ b/configure.ac @@ -52,7 +52,6 @@ AC_TYPE_OFF_T AC_CHECK_DECLS([mktemp]) AC_CHECK_FUNCS(geteuid getuid mktemp raise sigaction sigprocmask sigsetmask) AC_FUNC_SETMODE_DOS -PATCH_FUNC_MKDIR_TAKES_ONE_ARG AC_PATH_PROG([ED], [ed], [ed]) AC_DEFINE_UNQUOTED([EDITOR_PROGRAM], ["$ED"], [Name of editor program.]) diff --git a/m4/mkdir.m4 b/m4/mkdir.m4 deleted file mode 100644 index 9d8c4ca..0000000 --- a/m4/mkdir.m4 +++ /dev/null @@ -1,40 +0,0 @@ -#serial 2 - -dnl From Mumit Khan and Paul Eggert -dnl Determine whether mkdir accepts only one argument instead of the usual two. - -AC_DEFUN([PATCH_FUNC_MKDIR_TAKES_ONE_ARG], - [AC_CHECK_FUNCS(mkdir) - AC_CACHE_CHECK([whether mkdir takes only one argument], - patch_cv_mkdir_takes_one_arg, - [patch_cv_mkdir_takes_one_arg=no - if test $ac_cv_func_mkdir = yes; then - AC_TRY_COMPILE([ -#include <sys/types.h> -#include <sys/stat.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif - ], - [mkdir (".", 0);], - , - [AC_TRY_COMPILE([ -#include <sys/types.h> -#include <sys/stat.h> -#ifdef HAVE_UNISTD_H -# include <unistd.h> -#endif - ], - [mkdir (".");], - patch_cv_mkdir_takes_one_arg=yes - )] - ) - fi - ] - ) - if test $patch_cv_mkdir_takes_one_arg = yes; then - AC_DEFINE([MKDIR_TAKES_ONE_ARG], 1, - [Define if mkdir takes only one argument.]) - fi - ] -) diff --git a/src/common.h b/src/common.h index 94c319f..3aaebe8 100644 --- a/src/common.h +++ b/src/common.h @@ -190,11 +190,6 @@ extern int errno; #include <fcntl.h> -#ifdef MKDIR_TAKES_ONE_ARG -# undef mkdir -# define mkdir(name, mode) ((mkdir) (name)) -#endif - #ifdef HAVE_SETMODE_DOS XTERN int binary_transput; /* O_BINARY if binary i/o is desired */ #else |