Browse Source

Oh, that's where the check_gnu_make thingy went.

Douglas William Thrift 8 years ago
parent
commit
b6f07bd08e
3 changed files with 15 additions and 95 deletions
  1. 14 14
      autogen.sh
  2. 0 80
      check_gnu_make.m4
  3. 1 1
      configure.ac

+ 14 - 14
autogen.sh

@@ -20,26 +20,26 @@
 #  limitations under the License.
 
 set -e
-shopt -s extglob
+#shopt -s extglob
 cd `dirname $0`
 
-ac_m4s=(check_gnu_make.m4)
-ac_dir=`aclocal --print-ac-dir`
+#ac_m4s=()
+#ac_dir=`aclocal --print-ac-dir`
 
-for ac_m4 in ${ac_m4s[@]}; do
-	if [[ $ac_dir/$ac_m4 -nt $ac_m4 ]]; then
-		install -m 644 $ac_dir/$ac_m4 .
-		rm -fv aclocal.m4
-	fi
-done
+#for ac_m4 in ${ac_m4s[@]}; do
+#	if [[ $ac_dir/$ac_m4 -nt $ac_m4 ]]; then
+#		install -m 644 $ac_dir/$ac_m4 .
+#		rm -fv aclocal.m4
+#	fi
+#done
 
 aclocal
 
-for ac_m4 in ${ac_m4s[@]}; do
-	if ! grep -qs "^# ${ac_m4//./\\.}$" aclocal.m4; then
-		echo -e "# $ac_m4\n$(<$ac_m4)" >> aclocal.m4
-	fi
-done
+#for ac_m4 in ${ac_m4s[@]}; do
+#	if ! grep -qs "^# ${ac_m4//./\\.}$" aclocal.m4; then
+#		echo -e "# $ac_m4\n$(<$ac_m4)" >> aclocal.m4
+#	fi
+#done
 
 automake -acf || true
 autoconf

+ 0 - 80
check_gnu_make.m4

@@ -1,80 +0,0 @@
-# ===========================================================================
-#             http://autoconf-archive.cryp.to/check_gnu_make.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   CHECK_GNU_MAKE()
-#
-# DESCRIPTION
-#
-#   This macro searches for a GNU version of make. If a match is found, the
-#   makefile variable `ifGNUmake' is set to the empty string, otherwise it
-#   is set to "#". This is useful for including a special features in a
-#   Makefile, which cannot be handled by other versions of make. The
-#   variable _cv_gnu_make_command is set to the command to invoke GNU make
-#   if it exists, the empty string otherwise.
-#
-#   Here is an example of its use:
-#
-#   Makefile.in might contain:
-#
-#       # A failsafe way of putting a dependency rule into a makefile
-#       $(DEPEND):
-#               $(CC) -MM $(srcdir)/*.c > $(DEPEND)
-#
-#       @ifGNUmake@ ifeq ($(DEPEND),$(wildcard $(DEPEND)))
-#       @ifGNUmake@ include $(DEPEND)
-#       @ifGNUmake@ endif
-#
-#   Then configure.in would normally contain:
-#
-#       CHECK_GNU_MAKE()
-#       AC_OUTPUT(Makefile)
-#
-#   Then perhaps to cause gnu make to override any other make, we could do
-#   something like this (note that GNU make always looks for GNUmakefile
-#   first):
-#
-#       if  ! test x$_cv_gnu_make_command = x ; then
-#               mv Makefile GNUmakefile
-#               echo .DEFAULT: > Makefile ;
-#               echo \  $_cv_gnu_make_command \$@ >> Makefile;
-#       fi
-#
-#   Then, if any (well almost any) other make is called, and GNU make also
-#   exists, then the other make wraps the GNU make.
-#
-# LAST MODIFICATION
-#
-#   2008-04-12
-#
-# COPYLEFT
-#
-#   Copyright (c) 2008 John Darrington <j.darrington@elvis.murdoch.edu.au>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved.
-
-AC_DEFUN(
-        [CHECK_GNU_MAKE], [ AC_CACHE_CHECK( for GNU make,_cv_gnu_make_command,
-                _cv_gnu_make_command='' ;
-dnl Search all the common names for GNU make
-                for a in "$MAKE" make gmake gnumake ; do
-                        if test -z "$a" ; then continue ; fi ;
-                        if  ( sh -c "$a --version" 2> /dev/null | grep GNU  2>&1 > /dev/null ) ;  then
-                                _cv_gnu_make_command=$a ;
-                                break;
-                        fi
-                done ;
-        ) ;
-dnl If there was a GNU version, then set @ifGNUmake@ to the empty string, '#' otherwise
-        if test  "x$_cv_gnu_make_command" != "x"  ; then
-                ifGNUmake='' ;
-        else
-                ifGNUmake='#' ;
-                AC_MSG_RESULT("Not found");
-        fi
-        AC_SUBST(ifGNUmake)
-] )

+ 1 - 1
configure.ac

@@ -22,7 +22,7 @@ AC_PREREQ([2.62])
 AC_INIT([DT PS Tree], [1.1.0], [douglas@douglasthrift.net], [dtpstree], [http://code.douglasthrift.net/trac/dtpstree])
 AC_CONFIG_SRCDIR([dtpstree.cpp])
 AC_CONFIG_AUX_DIR([build-aux])
-CHECK_GNU_MAKE
+AX_CHECK_GNU_MAKE
 AC_SUBST([GNUMAKE], [$_cv_gnu_make_command])
 AS_IF([test "x$GNUMAKE" = x], [AC_MSG_ERROR([You need GNU make])])
 AC_PROG_INSTALL