diff options
| author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2021-10-12 22:12:34 +0200 |
|---|---|---|
| committer | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2021-10-19 05:13:17 +0200 |
| commit | 4c560cf7164f2ed3027ee00a7b00e8f4978ab6eb (patch) | |
| tree | 57d9492c48bf9c4e256962eab976acc96f661a49 | |
| parent | bb625e03ea0c79426c6ffdceaee8b9513c5d8caa (diff) | |
| download | libgphoto2-4c560cf7164f2ed3027ee00a7b00e8f4978ab6eb.tar.gz | |
Use && and || instead of test arguments -a and -o
For portability, use && and || instead of the test arguments
-a and -o.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | gphoto-m4/gp-byteorder.m4 | 2 | ||||
| -rw-r--r-- | libgphoto2_port/configure.ac | 4 | ||||
| -rw-r--r-- | libgphoto2_port/gphoto-m4/gp-byteorder.m4 | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 0b15d0762..ac0f69f32 100644 --- a/configure.ac +++ b/configure.ac @@ -205,7 +205,7 @@ dnl AC_CHECK_FUNC(gettext, gettext_without_libintl=true) # if gettext() doesn't require linking against libintl, # we don't have to check for gettext in libintl. Otherwise # we may even require libintl. -dnl if test "$gettext_without_libintl" != "true" -a "$USE_NLS" = "yes"; then +dnl if test "x$gettext_without_libintl" != xtrue && test "x$USE_NLS" = xyes; then dnl AC_CHECK_LIB([intl], [gettext], [INTLLIBS="$INTLLIBS -lintl"]) dnl fi diff --git a/gphoto-m4/gp-byteorder.m4 b/gphoto-m4/gp-byteorder.m4 index 2f2ce0be4..95d7435bf 100644 --- a/gphoto-m4/gp-byteorder.m4 +++ b/gphoto-m4/gp-byteorder.m4 @@ -40,7 +40,7 @@ fi # We're only interested in the target CPU, but it's not always set effective_target="$target" -if test "x$effective_target" = xNONE -o "x$effective_target" = x ; then +if test "x$effective_target" = xNONE || test "x$effective_target" = x ; then effective_target="$host" fi AC_SUBST(effective_target) diff --git a/libgphoto2_port/configure.ac b/libgphoto2_port/configure.ac index aacdd47e7..af698723a 100644 --- a/libgphoto2_port/configure.ac +++ b/libgphoto2_port/configure.ac @@ -137,7 +137,7 @@ AC_CHECK_FUNC(gettext, gettext_without_libintl=true) # we don't have to check for gettext in libintl. Otherwise # we may even require libintl. dnl AC_CHECK_LIB(intl, gettext, [LIBS="$LIBS -lintl"]) -if test "$gettext_without_libintl" != "true" -a "$USE_NLS" = "yes"; then +if test "x$gettext_without_libintl" != xtrue && test "x$USE_NLS" = xyes; then AC_CHECK_LIB(intl, gettext, [INTLLIBS="$INTLLIBS -lintl"]) fi @@ -425,7 +425,7 @@ GP_CHECK_LIBRARY([LIBUSB],[libusb],[>= 0.1.5], [http://libusb.sourceforge.net/] ) dnl depends on libusb's availability -GP_UDEV([test "x$have_LIBUSB" = xyes -o "x$have_LIBUSB1" = xyes]) +GP_UDEV([test "x$have_LIBUSB" = xyes || test "x$have_LIBUSB1" = xyes]) AC_ARG_ENABLE([disk], diff --git a/libgphoto2_port/gphoto-m4/gp-byteorder.m4 b/libgphoto2_port/gphoto-m4/gp-byteorder.m4 index 2f2ce0be4..95d7435bf 100644 --- a/libgphoto2_port/gphoto-m4/gp-byteorder.m4 +++ b/libgphoto2_port/gphoto-m4/gp-byteorder.m4 @@ -40,7 +40,7 @@ fi # We're only interested in the target CPU, but it's not always set effective_target="$target" -if test "x$effective_target" = xNONE -o "x$effective_target" = x ; then +if test "x$effective_target" = xNONE || test "x$effective_target" = x ; then effective_target="$host" fi AC_SUBST(effective_target) |