From: William Cohen <wcohen@redhat.com>
Date: Fri, 3 Sep 2021 21:14:12 +0000 (-0400)
Subject: Move HAVE_DYNINST setting back to original/correct place.
X-Git-Tag: release-4.6~42
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=a60db19f512c27d4dd00b1c72484fc2b7fd7fda5;p=systemtap.git

Move HAVE_DYNINST setting back to original/correct place.
---

diff --git a/configure b/configure
index dde728f92..f63044688 100755
--- a/configure
+++ b/configure
@@ -681,11 +681,11 @@ HAVE_LIBVIRT_FALSE
 HAVE_LIBVIRT_TRUE
 libvirt_LIBS
 libvirt_CFLAGS
+HAVE_DYNINST_FALSE
+HAVE_DYNINST_TRUE
 DYNINST_LIBS
 DYNINST_LDFLAGS
 DYNINST_CXXFLAGS
-HAVE_DYNINST_FALSE
-HAVE_DYNINST_TRUE
 BOOST_SYSTEM_LIB
 CXXCPP
 stapbpf_LIBS
@@ -12031,14 +12031,6 @@ if test "${with_dyninst+set}" = set; then :
 fi
 
 
- if test "${have_dyninst}" = "yes"; then
-  HAVE_DYNINST_TRUE=
-  HAVE_DYNINST_FALSE='#'
-else
-  HAVE_DYNINST_TRUE='#'
-  HAVE_DYNINST_FALSE=
-fi
-
 case "$with_dyninst" in
 no) ;;
 ''|yes) # Try a simple-minded distro search
@@ -12099,6 +12091,14 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 fi
+ if test "${have_dyninst}" = "yes"; then
+  HAVE_DYNINST_TRUE=
+  HAVE_DYNINST_FALSE='#'
+else
+  HAVE_DYNINST_TRUE='#'
+  HAVE_DYNINST_FALSE=
+fi
+
 
 
 
diff --git a/configure.ac b/configure.ac
index 36549db9e..8e0ea09ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -608,7 +608,6 @@ AC_ARG_WITH([dyninst],
   AS_HELP_STRING([--with-dyninst=DIRECTORY],
     [find dyninst headers/libraries in DIRECTORY]))
 
-AM_CONDITIONAL([HAVE_DYNINST], [test "${have_dyninst}" = "yes"])
 case "$with_dyninst" in
 no) ;;
 ''|yes) # Try a simple-minded distro search
@@ -644,6 +643,7 @@ if test "$with_dyninst" != "no"; then
   CPPFLAGS="$old_CPPFLAGS"
   AC_LANG_POP(C++)
 fi
+AM_CONDITIONAL([HAVE_DYNINST], [test "${have_dyninst}" = "yes"])
 
 
 dnl Check for the libvirt and libxml2 devel packages
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 2247c7f27..82bd5dc59 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -541,8 +541,8 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-@BUILD_DOCS_FALSE@uninstall-local:
 @BUILD_DOCS_FALSE@clean-local:
+@BUILD_DOCS_FALSE@uninstall-local:
 @BUILD_DOCS_FALSE@install-data-hook:
 clean: clean-recursive
 
diff --git a/doc/beginners/Makefile.in b/doc/beginners/Makefile.in
index a63c09660..f38cb8ac7 100644
--- a/doc/beginners/Makefile.in
+++ b/doc/beginners/Makefile.in
@@ -409,8 +409,8 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-@INSTALL_PREBUILT_DOCS_FALSE@clean-local:
 @INSTALL_PREBUILT_DOCS_FALSE@uninstall-local:
+@INSTALL_PREBUILT_DOCS_FALSE@clean-local:
 @INSTALL_PREBUILT_DOCS_FALSE@install-data-hook:
 clean: clean-am
 
diff --git a/java/Makefile.in b/java/Makefile.in
index 2c2d16637..f769f103b 100644
--- a/java/Makefile.in
+++ b/java/Makefile.in
@@ -685,8 +685,8 @@ maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
 	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-@HAVE_JAVA_FALSE@install-exec-local:
 @HAVE_JAVA_FALSE@install-data-local:
+@HAVE_JAVA_FALSE@install-exec-local:
 @HAVE_JAVA_FALSE@uninstall-local:
 clean: clean-am
 
diff --git a/python/Makefile.in b/python/Makefile.in
index 9d5d4e750..fe067daac 100644
--- a/python/Makefile.in
+++ b/python/Makefile.in
@@ -530,8 +530,8 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-@HAVE_PYTHON_PROBES_FALSE@clean-local:
 @HAVE_PYTHON_PROBES_FALSE@install-exec-local:
+@HAVE_PYTHON_PROBES_FALSE@clean-local:
 clean: clean-am
 
 clean-am: clean-generic clean-local mostlyclean-am
diff --git a/stap-exporter/Makefile.in b/stap-exporter/Makefile.in
index 370115a8e..f5bd8a3e9 100644
--- a/stap-exporter/Makefile.in
+++ b/stap-exporter/Makefile.in
@@ -523,9 +523,9 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+@HAVE_PYTHON3_PROBES_FALSE@install-data-local:
 @HAVE_PYTHON3_PROBES_FALSE@clean-local:
 @HAVE_PYTHON3_PROBES_FALSE@uninstall-local:
-@HAVE_PYTHON3_PROBES_FALSE@install-data-local:
 clean: clean-am
 
 clean-am: clean-generic clean-local mostlyclean-am