diff options
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | libgphoto2_port/configure.ac | 6 | ||||
| -rw-r--r-- | libgphoto2_port/gphoto-m4/gp-set.m4 | 1 |
3 files changed, 3 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 27ddee379..19afd97de 100644 --- a/configure.ac +++ b/configure.ac @@ -111,13 +111,9 @@ AC_PROG_CC AC_PROG_CPP AC_PROG_CXX AC_PROG_INSTALL +AC_PROG_SED AM_PROG_AR -dnl Something with the sequences is not quite alright yet. -dnl SED is supposed to be set in AC_LIBTOOL_SETUP, but the -dnl sequence seems to get mixed up. -SED=${SED-sed} - dnl If CXX is neither unset nor empty nor "no", presume we can compile dnl C++ sources. A C++ compiler is not required for libgphoto2 itself, diff --git a/libgphoto2_port/configure.ac b/libgphoto2_port/configure.ac index f88cea342..2952696f4 100644 --- a/libgphoto2_port/configure.ac +++ b/libgphoto2_port/configure.ac @@ -73,14 +73,10 @@ dnl --------------------------------------------------------------------------- AC_PROG_CC AC_PROG_CPP AC_PROG_INSTALL +AC_PROG_SED AM_PROG_AR -dnl Something with the sequences is not quite alright yet. -dnl SED is supposed to be set in AC_LIBTOOL_SETUP, but the -dnl sequence seems to get mixed up. -SED=${SED-sed} - dnl check for/set up libtool and libltdl dnl AC_DISABLE_STATIC dnl AC_DISABLE_SHARED diff --git a/libgphoto2_port/gphoto-m4/gp-set.m4 b/libgphoto2_port/gphoto-m4/gp-set.m4 index 444d71f76..f9a061ec2 100644 --- a/libgphoto2_port/gphoto-m4/gp-set.m4 +++ b/libgphoto2_port/gphoto-m4/gp-set.m4 @@ -168,6 +168,7 @@ dnl GP_SET_DUMP_ALL dnl Dump all sets to stdout. Intended for helping with debugging. dnl ###################################################################### AC_DEFUN([GP_SET_DUMP_ALL], [dnl +AC_REQUIRE([AC_PROG_SED])dnl AC_REQUIRE([_GP_SET_INIT])dnl for setfile in gp-set-file--* do |