X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fdirname.m4;h=e35da96582ba767db34fe7f1dfa73c046dfcca17;hb=6d5b64e8b1a223481ddf2fb18fc4923ed1888a66;hp=48ecd009ef0d22a835421cfc4a2ceb2f71d5d0b6;hpb=e75f5a624421fe98932ce123a300bc463aa44bc2;p=gnulib.git

diff --git a/m4/dirname.m4 b/m4/dirname.m4
index 48ecd009e..e35da9658 100644
--- a/m4/dirname.m4
+++ b/m4/dirname.m4
@@ -1,27 +1,18 @@
-#serial 1
+#serial 7   -*- autoconf -*-
+dnl Copyright (C) 2002-2006 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
-dnl See if the dirname function modifies its argument.
-dnl We can't just do AC_REPLACE_FUNCS(dirname) because some systems
-dnl (e.g., X/Open) have a function by that name that modifies and returns
-dnl its argument.
-AC_DEFUN(jm_FUNC_DIRNAME,
-[dnl
-  AC_CACHE_CHECK([for working dirname function], jm_cv_func_working_dirname,
-  [AC_TRY_RUN([
-    int main ()
-    {
-      const char *path = "a/b";
-      char *dir = dirname (path);
-      exit ((dir != path && *dir == 'a' && dir[1] == 0) ? 0 : 1);
-    }
-    ], jm_cv_func_working_dirname=yes dnl The library version works.
-    , jm_cv_func_working_dirname=no dnl The library version does NOT work.
-    , jm_cv_func_working_dirname=no dnl We're cross compiling.
-    )
-  ])
+AC_DEFUN([gl_DIRNAME],
+[
+  AC_LIBOBJ([basename])
+  AC_LIBOBJ([dirname])
+  AC_LIBOBJ([stripslash])
 
-  if test $jm_cv_func_working_dirname = no; then
-    LIBOBJS="$LIBOBJS dirname.o"
-    AC_SUBST(LIBOBJS)dnl
-  fi
+  dnl Prerequisites of lib/dirname.h.
+  AC_REQUIRE([gl_AC_DOS])
+  AC_REQUIRE([gl_DOUBLE_SLASH_ROOT])
+
+  dnl No prerequisites of lib/basename.c, lib/dirname.c, lib/stripslash.c.
 ])