Changeset 379 for branches

Timestamp:

07/02/2009 18:34:55 (3 years ago)

Author:

blee

Message:

Merge autotools greadlink detection from trunk.

See #45

Location:

branches/confman-1.9

Files:

• . (modified) (1 prop)
• Makefile.am (modified) (1 diff)
• abspath.in (modified) (1 prop)
• configure.ac (modified) (1 diff)
• conflock.in (modified) (1 prop)
• confmancommon.sh.in (modified) (2 diffs)
• confmanlib.sh.in (modified) (1 prop)

branches/confman-1.9/Makefile.am

@@ -52 +52 @@
                 -e 's,[@]BASH[@],$(BASH),g' \
                 -e 's,[@]SUDO[@],$(SUDO),g' \
-                -e 's,[@]SVN[@],$(SVN),g'
+                -e 's,[@]SVN[@],$(SVN),g' \
+                -e 's,[@]GREADLINK[@],$(GREADLINK),g'
 
 confman: confman.in Makefile

branches/confman-1.9/configure.ac

@@ -9 +9 @@
 AC_PATH_PROG([SVN], [svn])
 AC_PATH_PROG([SUDO], [sudo])
+AC_PATH_PROG([GREADLINK], [greadlink])
 
 AC_CONFIG_FILES([Makefile])

branches/confman-1.9/confmancommon.sh.in

@@ -79 +79 @@
     stat_cmd="stat -f"
     stat_opts="mode=%Mp%Lp owner=%Su group=%Sg"
-    readlink_cmd="greadlink"
+    readlink_cmd="@GREADLINK@"
     ;;
     Linux)
@@ -97 +97 @@
     stat_cmd="stat -f"
     stat_opts="mode=%Mp%Lp owner=%Su group=%Sg"
-    readlink_cmd="greadlink"
+    readlink_cmd="@GREADLINK@"
     ;;
 esac