Changeset d11524 in git


Ignore:
Timestamp:
Apr 14, 2011, 12:54:46 PM (13 years ago)
Author:
Mohamed Barakat <mohamed.barakat@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38077648e7239f98078663eb941c3c979511150a')
Children:
72015634c9aa4b237c52f66b5528b431f59c3c5c
Parents:
691dbab4f58d7c8d1f15856e249e5d8a0be23d2d
git-author:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-04-14 12:54:46+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:12:34+01:00
Message:
- merge libpolys/{misc,reporter,resources}/configure.ac into libpolys/configure.ac
- seperate some of the checks in separate m4 files
Files:
1 added
15 deleted
5 edited
1 moved

Legend:

Unmodified
Added
Removed

  • for_Hans_with_love.sh

    r691dba rd11524  
    1414TOP_DIR=$PWD
    1515
    16 for d in . libpolys; do
     16for d in .; do
    1717  echo "==============="
    18   echo "run aclocal, autoconf in $d"
     18  echo "run aclocal -I $TOP_DIR/m4, autoconf, automake -a in $d"
    1919  echo "---------------"
    2020  cd $d;
    … …  
    2626done
    2727
    28 for d in omalloc libpolys/misc libpolys/resources libpolys/reporter libpolys/coeffs; do
     28for d in libpolys; do
    2929  echo "==============="
    30   echo "run aclocal -I $TOP_DIR/m4, autoheader, autoconf in $d"
     30  echo "run aclocal -I $TOP_DIR/m4, autotools in $d"
     31  echo "---------------"
     32  cd $d;
     33  aclocal -I $TOP_DIR/m4
     34  autotools
     35  cd $TOP_DIR
     36  echo
     37done
     38
     39for d in omalloc libpolys/coeffs; do
     40  echo "==============="
     41  echo "run aclocal -I $TOP_DIR/m4, autotools in $d"
    3142  echo "---------------"
    3243  cd $d;
    … …  
    3950for d in libpolys/polys; do
    4051  echo "==============="
    41   echo "run aclocal -I $TOP_DIR/m4 -I m4, autoheader, autoconf in $d"
     52  echo "run aclocal -I $TOP_DIR/m4 -I m4, autotools in $d"
    4253  echo "---------------"
    4354  cd $d;

  • libpolys/configure.ac

    r691dba rd11524  
    22AM_INIT_AUTOMAKE
    33AC_CONFIG_MACRO_DIR([../m4])
     4AC_CONFIG_SRCDIR([reporter/reporter.h])
     5AC_CONFIG_HEADER([config.h])
    46
     7# misc/auxiliary.h
     8
     9# Checks for programs.
     10AC_PROG_CXX
    511AC_PROG_CC
    6 AC_PROG_CXX
     12AC_PROG_LN_S
     13AC_PROG_INSTALL
     14AC_PROG_RANLIB
     15AM_PROG_CC_C_O
    716
    817# Checks for libraries.
    918LB_CHECK_GMP(,,AC_MSG_ERROR([Unable to find GMP on your machine: please use --with-gmp=PATH_TO_DIR_CONTAINING_LIB_AND_INCLUDE (see also ./configure --help if you do not understand what we are talking about)]))
    1019
     20# Checks for header files.
     21AC_HEADER_STDC
     22AC_CHECK_HEADERS([stdlib.h string.h unistd.h pwd.h sys/param.h limits.h])
     23
     24# Checks for typedefs, structures, and compiler characteristics.
     25AC_C_CONST
     26AC_C_INLINE
     27
     28SING_CHECK_PIPE
     29
     30# Checks for library functions.
     31AC_FUNC_VPRINTF
     32AC_CHECK_FUNC([vsnprintf], [AC_DEFINE([HAVE_VSNPRINTF], [1],
     33                               [Define if vsnprintf exists.])])
     34# check for cpu properties
     35AC_CHECK_SIZEOF(long,4)
     36SING_CHECK_CPU
     37
    1138AC_CONFIG_FILES([Makefile])
     39AC_CONFIG_FILES([misc/Makefile])
     40AC_CONFIG_FILES([reporter/Makefile])
     41AC_CONFIG_FILES([resources/Makefile])
    1242AC_CONFIG_FILES([tests/Makefile])
    13 AC_CONFIG_SUBDIRS([misc reporter resources coeffs polys])
     43AC_CONFIG_SUBDIRS([coeffs polys])
    1444AC_OUTPUT

  • libpolys/misc/Makefile.am

    r691dba rd11524  
    1313libmisc_g_a_CPPFLAGS = -DHAVE_CONFIG_H
    1414
    15 INCLUDES = -I${top_srcdir}/.. -I${top_srcdir}/../.. -I${top_builddir}/..
     15INCLUDES = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir}
    1616
    1717SOURCES  = intvec.cc

  • libpolys/reporter/Makefile.am

    r691dba rd11524  
    1313libreporter_g_a_CPPFLAGS = -DHAVE_CONFIG_H
    1414
    15 INCLUDES = -I${top_srcdir}/.. -I${top_srcdir}/../.. -I${top_builddir}/..
     15INCLUDES = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir}
    1616
    1717SOURCES  = dError.c reporter.cc

  • libpolys/resources/Makefile.am

    r691dba rd11524  
    1313libresources_g_a_CPPFLAGS = -DHAVE_CONFIG_H
    1414
    15 INCLUDES = -I${top_srcdir}/.. -I${top_srcdir}/../.. -I${top_builddir}/..
     15INCLUDES = -I${top_srcdir} -I${top_srcdir}/.. -I${top_builddir}
    1616
    1717SOURCES = feFopen.cc feResource.cc

  • m4/cpu-check.m4

    r691dba rd11524  
    1 #                                               -*- Autoconf -*-
    2 # Process this file with autoconf to produce a configure script.
     1# Check the cpu type
    32
    4 AC_PREREQ([2.65])
    5 AC_INIT([misc], [3.1.2.sw])
    6 AM_INIT_AUTOMAKE
    7 AC_CONFIG_SRCDIR([mylimits.h])
    8 AC_CONFIG_HEADERS([config.h])
     3dnl SING_CHECK_CPU
     4dnl
     5dnl check the cpu and define EXEC_EXT and SI_CPU*
    96
    10 # Checks for programs.
    11 AC_PROG_CC
    12 AC_PROG_CXX
    13 AC_PROG_LN_S
    14 AC_PROG_INSTALL
    15 AC_PROG_RANLIB
    16 AM_PROG_CC_C_O
    17 
    18 # Checks for libraries.
    19 
    20 # Checks for header files.
    21 AC_CHECK_HEADERS([limits.h])
    22 
    23 # Checks for typedefs, structures, and compiler characteristics.
    24 AC_C_INLINE
    25 
     7AC_DEFUN([SING_CHECK_CPU],
     8[
    269# Checks for library functions.
    2710AC_MSG_CHECKING(CPU for singular)
    2811
    29 # check for cpu properties:
    30 AC_CHECK_SIZEOF(long,4)
    31 
    32 # UNAME and PATH
     12# CPUUNAME and PATH
    3313ac_cv_singcpuname=`uname -m`
    3414AC_MSG_RESULT($ac_cv_singcpuname)
    … …  
    8666fi
    8767
    88 AC_CONFIG_FILES([Makefile])
    89 AC_OUTPUT
     68# UNAME and PATH
     69AC_MSG_CHECKING(uname for Singular)
     70
     71#ac_cv_singuname=`singuname.sh`
     72AC_MSG_RESULT($ac_cv_singuname)
     73if test "$ac_cv_singuname" = unknown; then
     74  AC_MSG_WARN(Unknown architecture: Check singuname.sh)
     75  ac_cv_singuname="unknown"
     76fi
     77AC_DEFINE_UNQUOTED(S_UNAME, "$ac_cv_singuname", Singular's own uname\, believe it or not)
     78
     79])
Note: See TracChangeset for help on using the changeset viewer.