Attachment #255375 for bug #302614




***])
       ])

dnl Die if the user tries to configure as root, see:
dnl https://www.redhat.com/archives/libguestfs/2010-April/msg00098.html
AC_MSG_CHECKING([if you are trying to configure as root])
AS_IF([test "`id -u`" = 0 ],[
            AC_MSG_RESULT([yes])
            AC_MSG_FAILURE([Don't run './configure' or 'make' as root.])
      ],[
            AC_MSG_RESULT([no])
      ])

dnl Early gnulib initialization.
gl_EARLY
gl_INIT

AC_SUBST(JNI_INSTALL_DIR)
AC_SUBST(JNI_VERSION_INFO)

AM_CONDITIONAL([HAVE_JAVA],[test -n "$JAVAC" -a "x$with_java_home" != "xno"])

dnl Check for Haskell (GHC).
GHC=no

Lines 192-198 Link Here

(-)src/Makefile.am.orig (-4 lines)
192	all-local: checkroot	192	all-local: checkroot
193	check-local: checkroot	193	check-local: checkroot
194	checkroot:	194	checkroot:
195	@if [ "`id -u`" = 0 ]; then \
196	echo "*** Error: Don't run 'make' or 'make check' as root."; \
197	exit 1; \
198	fi

Return to bug 302614

Lines 53-68 Link Here

(-)configure.ac.orig (-11 / +1 lines)
53	***])	53	***])
54	])	54	])
55		55
56	dnl Die if the user tries to configure as root, see:
57	dnl https://www.redhat.com/archives/libguestfs/2010-April/msg00098.html
58	AC_MSG_CHECKING([if you are trying to configure as root])
59	AS_IF([test "`id -u`" = 0 ],[
60	AC_MSG_RESULT([yes])
61	AC_MSG_FAILURE([Don't run './configure' or 'make' as root.])
62	],[
63	AC_MSG_RESULT([no])
64	])
65
66	dnl Early gnulib initialization.	56	dnl Early gnulib initialization.
67	gl_EARLY	57	gl_EARLY
68	gl_INIT	58	gl_INIT
Lines 760-766 Link Here
760	AC_SUBST(JNI_INSTALL_DIR)	750	AC_SUBST(JNI_INSTALL_DIR)
761	AC_SUBST(JNI_VERSION_INFO)	751	AC_SUBST(JNI_VERSION_INFO)
762		752
763	AM_CONDITIONAL([HAVE_JAVA],[test -n "$JAVAC"])	753	AM_CONDITIONAL([HAVE_JAVA],[test -n "$JAVAC" -a "x$with_java_home" != "xno"])
764		754
765	dnl Check for Haskell (GHC).	755	dnl Check for Haskell (GHC).
766	GHC=no	756	GHC=no