diff options
Diffstat (limited to 'libgphoto2_port/gphoto-m4/gp-progs.m4')
| -rw-r--r-- | libgphoto2_port/gphoto-m4/gp-progs.m4 | 32 |
1 files changed, 10 insertions, 22 deletions
diff --git a/libgphoto2_port/gphoto-m4/gp-progs.m4 b/libgphoto2_port/gphoto-m4/gp-progs.m4 index 6bf530616..e7d09f4f9 100644 --- a/libgphoto2_port/gphoto-m4/gp-progs.m4 +++ b/libgphoto2_port/gphoto-m4/gp-progs.m4 @@ -1,5 +1,5 @@ # gp-progs.m4 - look for certain well-known tools -*- Autoconf -*- -# serial 14 +# serial 15 dnl | Increment the above serial number every time you edit this file. dnl | When it finds multiple m4 files with the same name, dnl | aclocal will use the one with the highest serial. @@ -15,8 +15,7 @@ dnl dnl #################################################################### m4_pattern_forbid([GP_PROG_CMP])dnl AC_DEFUN_ONCE([GP_PROG_CMP],[dnl -AC_ARG_VAR([CMP], [cmp file comparison command])dnl -AC_PATH_PROG([CMP], [cmp])dnl +GP_CHECK_PROG([CMP], [cmp], [file comparison command])dnl ])dnl dnl dnl @@ -25,8 +24,7 @@ dnl dnl #################################################################### m4_pattern_forbid([GP_PROG_COMM])dnl AC_DEFUN_ONCE([GP_PROG_COMM],[dnl -AC_ARG_VAR([COMM], [comm line by line comparison command])dnl -AC_PATH_PROG([COMM], [comm])dnl +GP_CHECK_PROG([COMM], [comm], [line by line comparison command])dnl ])dnl dnl dnl @@ -35,8 +33,7 @@ dnl dnl #################################################################### m4_pattern_forbid([GP_PROG_DIFF])dnl AC_DEFUN_ONCE([GP_PROG_DIFF],[dnl -AC_ARG_VAR([DIFF], [diff file comparison command])dnl -AC_PATH_PROG([DIFF], [diff])dnl +GP_CHECK_PROG([DIFF], [diff], [file comparison command])dnl dnl dnl DIFF_MAYBE_U only contains -u for readability, so if diff does not dnl support -u, we can still just run DIFF without -u. @@ -60,8 +57,7 @@ dnl dnl #################################################################### m4_pattern_forbid([GP_PROG_EXPR])dnl AC_DEFUN_ONCE([GP_PROG_EXPR],[dnl -AC_ARG_VAR([EXPR], [expr expression evaluation command])dnl -AC_PATH_PROG([EXPR], [expr])dnl +GP_CHECK_PROG([EXPR], [expr], [expression evaluation command])dnl ])dnl dnl dnl @@ -70,14 +66,9 @@ dnl dnl #################################################################### m4_pattern_forbid([GP_PROG_SLEEP])dnl AC_DEFUN_ONCE([GP_PROG_SLEEP],[dnl -AC_ARG_VAR([SLEEP], [sleep delay command])dnl +GP_CHECK_PROG([SLEEP], [sleep], [delay command])dnl AC_MSG_CHECKING([for sleep]) -AS_VAR_IF([SLEEP], [no], [dnl - AC_MSG_RESULT([no]) -], [dnl - AC_MSG_RESULT([yes]) - AC_PATH_PROG([SLEEP], [sleep])dnl -])dnl +AC_MSG_RESULT([${SLEEP}]) ])dnl dnl dnl @@ -86,8 +77,7 @@ dnl dnl #################################################################### m4_pattern_forbid([GP_PROG_SORT])dnl AC_DEFUN_ONCE([GP_PROG_SORT],[dnl -AC_ARG_VAR([SORT], [sort text file line sorting command])dnl -AC_PATH_PROG([SORT], [sort])dnl +GP_CHECK_PROG([SORT], [sort], [text file line sorting command])dnl ])dnl dnl dnl @@ -97,8 +87,7 @@ dnl #################################################################### m4_pattern_forbid([^GP_PROG_TR\(])dnl m4_pattern_forbid([^GP_PROG_TR$])dnl AC_DEFUN_ONCE([GP_PROG_TR],[dnl -AC_ARG_VAR([TR], [tr string character translation command])dnl -AC_PATH_PROG([TR], [tr])dnl +GP_CHECK_PROG([TR], [tr], [string character translation command])dnl ])dnl dnl dnl @@ -108,8 +97,7 @@ dnl #################################################################### m4_pattern_forbid([^GP_PROG_UNIQ\(])dnl m4_pattern_forbid([^GP_PROG_UNIQ$])dnl AC_DEFUN_ONCE([GP_PROG_UNIQ],[dnl -AC_ARG_VAR([UNIQ], [uniq sorted file uniquification command])dnl -AC_PATH_PROG([UNIQ], [uniq])dnl +GP_CHECK_PROG([UNIQ], [uniq], [sorted file unification command])dnl ])dnl dnl dnl |