Make --with-elfutils work with either a source release or git checkout.

Add configure check to see if this is a source release, or a source
checkout. We need --enable-maintainer-mode if it isn't a source release
to make sure some additional files are generated. This makes working
against non-released elfutils git checkout a lot easier.

diff --git a/configure b/configure
index bf527733c924f79fe872b8221ac40af2477b2caa..1d465659a942dfff5a81e25fa06c8b6ee3cdfa6e 100755 (executable)
--- a/configure
+++ b/configure
@@ -10429,12 +10429,21 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   # So we must make sure to pass those settings to elfutils configure.
   elfutils_rpath="-Wl,--enable-new-dtags,-rpath,${libdir}/${PACKAGE_NAME}"
   here=`pwd`
+  # Check whether this is a source release, or a source checkout.
+  # We need --enable-maintainer-mode if it isn't a source release.
+  # elfutils.spec is only distributed in source releases.
+  if test -f ${elfutils_srcdir}/elfutils.spec; then
+       need_maintainer_option=""
+  else
+       need_maintainer_option="--enable-maintainer-mode"
+  fi
   (mkdir -p build-elfutils && cd build-elfutils &&
    bash ${elfutils_srcdir}/configure --enable-libebl-subdir=${PACKAGE_NAME} \
                                --includedir="${here}/include-elfutils" \
                                --libdir="${here}/lib-elfutils" \
                                --exec-prefix="$exec_prefix" \
                                --prefix="$prefix" \
+                               ${need_maintainer_option} \
                                CFLAGS="${CFLAGS/-Wall/} $gnu89_inline_flag" \
                                LDFLAGS="$LDFLAGS $elfutils_rpath" &&
    if test -f ${elfutils_srcdir}/config/version.h.in; then

diff --git a/configure.ac b/configure.ac
index c8b90de2b191425c69d76fcb1f9748931e6954f8..590c4e51884e06ff53a086cbf071529e99f26918 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -535,12 +535,21 @@ if test $build_elfutils = yes -a $enable_translator = yes; then
   # So we must make sure to pass those settings to elfutils configure.
   elfutils_rpath="-Wl,--enable-new-dtags,-rpath,${libdir}/${PACKAGE_NAME}"
   here=`pwd`
+  # Check whether this is a source release, or a source checkout.
+  # We need --enable-maintainer-mode if it isn't a source release.
+  # elfutils.spec is only distributed in source releases.
+  if test -f ${elfutils_srcdir}/elfutils.spec; then
+       need_maintainer_option=""
+  else
+       need_maintainer_option="--enable-maintainer-mode"
+  fi
   (mkdir -p build-elfutils && cd build-elfutils &&
    bash ${elfutils_srcdir}/configure --enable-libebl-subdir=${PACKAGE_NAME} \
                                --includedir="${here}/include-elfutils" \
                                --libdir="${here}/lib-elfutils" \
                                --exec-prefix="$exec_prefix" \
                                --prefix="$prefix" \
+                               ${need_maintainer_option} \
                                CFLAGS="${CFLAGS/-Wall/} $gnu89_inline_flag" \
                                LDFLAGS="$LDFLAGS $elfutils_rpath" &&
    if test -f ${elfutils_srcdir}/config/version.h.in; then