Changeset 1769

Timestamp:

Feb 3, 2009, 11:01:29 PM (15 years ago)

Author:

Peter

Message:

Making cppflags -DHAVE_INLINE -DGSL_RANGE_CHECK_OFF -DNDEBUG private,
i.e., they are not propagated to yat-config and not set in autoconf
macro.

closes #485

Location:

trunk

Files:

• build_support/svn_support.am (modified) (1 diff)
• configure.ac (modified) (2 diffs)
• test/Makefile.am (modified) (2 diffs)
• test/create_yathello.sh.in (moved) (moved from trunk/test/yat_m4_test.sh.in) (2 diffs)

trunk/build_support/svn_support.am

@@ -32 +32 @@
   (cd tmp-repo && \
    ./bootstrap && \
-   mkdir build_ && \
+   $(MKDIR_P) build_ && \
+   $(MKDIR_P) install_ && \
    cd build_ && \
-   ../configure $(DISTCHECK_CONFIGURE_FLAGS) && \
+   ../configure $(DISTCHECK_CONFIGURE_FLAGS) \
+      --prefix=$(abs_builddir)/tmp-repo/dummy_install_ && \
+   $(MAKE) $(AM_MAKEFLAGS) prefix=$(abs_builddir)/tmp-repo/install_ && \
+   $(MAKE) $(AM_MAKEFLAGS) prefix=$(abs_builddir)/tmp-repo/install_ \
+           install && \
+   $(MAKE) $(AM_MAKEFLAGS) prefix=$(abs_builddir)/tmp-repo/install_ \
+           installcheck && \
    $(MAKE) $(AM_MAKEFLAGS) distcheck) && \
   mv tmp-repo/build_/$(distdir).tar.gz . && \

trunk/configure.ac

@@ -74 +74 @@
 AS_IF([test "x$ECHO" = x], [ECHO=echo])
 AC_SUBST(ECHO)
-
-# some tests require autotools
-AC_MSG_NOTICE([checking for autotools])
-AC_CHECK_PROG([have_automake], [automake], [yes], [no])
-AC_CHECK_PROG([have_autoconf], [autoconf], [yes], [no])
-AC_CHECK_PROG([have_libtool], [libtool], [yes], [no])
-AM_CONDITIONAL([HAVE_AUTOTOOLS], 
-               [test x$have_automake = xyes && 
-                test x$have_autoconf = xyes && 
-                test x$have_libtool = xyes])
 
 AC_MSG_NOTICE(dnl
@@ -307 +297 @@
 
 
-AC_CONFIG_FILES([test/yat_m4_test.sh], [chmod +x test/yat_m4_test.sh])
+AC_CONFIG_FILES([test/create_yathello.sh], [chmod +x test/create_yathello.sh])
 AC_CONFIG_FILES([Makefile
      build_support/Makefile

trunk/test/Makefile.am

@@ -32 +32 @@
 INSTALLCHECK_TARGETS =
 
-.PHONY: $(INSTALLCHECK_TARGETS)
+.PHONY: $(INSTALLCHECK_TARGETS) FORCE
 
 installcheck-local: $(INSTALLCHECK_TARGETS)
@@ -38 +38 @@
 clean-local:; rm -rf yathello
 
-if HAVE_AUTOTOOLS
-INSTALLCHECK_TARGETS += check-yat_m4
+if ENABLE_SVN_SUPPORT
+INSTALLCHECK_TARGETS += yat_check_yat_test
 endif
-check-yat_m4: yat_m4_test.sh
-  ./yat_m4_test.sh 
+
+yathello: create_yathello.sh
+  ./create_yathello.sh
+
+yat_check_yat_test: yathello
+  cd yathello && autoreconf -sivf && \
+  ./configure --with-yat=$(bindir) && $(MAKE) check
 
 check_PROGRAMS = alignment_test averager_test \

trunk/test/create_yathello.sh.in

@@ -24 +24 @@
 # configure.ac. The macro only works with an installed yat, so the
 # test should be run after `make install'.
-
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-bindir=@bindir@
 
 rm -rf yathello
@@ -73 +68 @@
 
 cp @abs_top_srcdir@/build_support/yat.m4 .
-
-autoreconf -sivf && ./configure --with-yat=$bindir && make check