Changeset ab4f17 in git


Ignore:
Timestamp:
Mar 31, 2011, 1:20:09 PM (12 years ago)
Author:
Mohamed Barakat <mohamed.barakat@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')
Children:
45d23321ec375e053d06319b3624e9a098669f4a
Parents:
cf5c053a2033583db0824a2b0459625b00d37a26
git-author:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-03-31 13:20:09+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:04:16+01:00
Message:
added an autoconf macro to check for GMP
Files:
1 added
7 edited

Legend:

Unmodified
Added
Removed

  • .gitignore

    rcf5c05 rab4f17  
    1111.libs
    1212libpolys/polys/templates/p_Procs_Generate
     13libpolys/polys/m4/
     14libpolys/coeffs/test
    1315depend
    1416tags

  • for_Hans_with_love.sh

    rcf5c05 rab4f17  
    22
    33echo "==============="
    4 echo "run libtootlize in libpolys/polys/"
     4echo "run libtoolize in libpolys/polys/"
    55echo "---------------"
    66( cd libpolys/polys/; libtoolize; )
    77
    88autotools (){
    9 aclocal
    109autoheader
    1110autoconf
    … …  
    2726done
    2827
    29 for d in omalloc libpolys/misc libpolys/resources libpolys/reporter libpolys/coeffs libpolys/polys; do
     28for d in omalloc libpolys/misc libpolys/resources libpolys/reporter; do
    3029  echo "==============="
    3130  echo "run aclocal, autoheader, autoconf in $d"
    3231  echo "---------------"
    3332  cd $d;
     33  aclocal
    3434  autotools
    3535  cd $TOP_DIR
    … …  
    3737done
    3838
     39for d in libpolys/coeffs; do
     40  echo "==============="
     41  echo "run aclocal -I ../../m4, autoheader, autoconf in $d"
     42  echo "---------------"
     43  cd $d;
     44  aclocal -I ../../m4
     45  autotools
     46  cd $TOP_DIR
     47  echo
     48done
     49
     50for d in libpolys/polys; do
     51  echo "==============="
     52  echo "run aclocal -I ../../m4 -I m4, autoheader, autoconf in $d"
     53  echo "---------------"
     54  cd $d;
     55  aclocal -I ../../m4 -I m4
     56  autotools
     57  cd $TOP_DIR
     58  echo
     59done
     60

  • libpolys/coeffs/Makefile.am

    rcf5c05 rab4f17  
     1ACLOCAL_AMFLAGS = -I ../../m4
    12lib_LIBRARIES=libcoeffs.a libcoeffs_g.a
    23
    … …  
    2122        mpr_complex.h mpr_global.h
    2223
    23 INCLUDES = -I${top_srcdir}/.. -I${top_srcdir}/../.. -I${top_builddir}/.. -I${srcdir}
     24INCLUDES = -I${top_srcdir}/.. -I${top_srcdir}/../.. -I${top_builddir}/.. -I${srcdir} ${GMP_CFLAGS}
    2425
    2526SOURCES = \
    … …  
    4748test_g_SOURCES = test.cc
    4849
    49 test_LDADD   = libcoeffs.a -lresources -lreporter -lgmp -lomalloc
    50 test_g_LDADD = libcoeffs_g.a -lresources_g -lreporter_g -lgmp -lomalloc_debug
     50test_LDADD   = libcoeffs.a -lresources -lreporter -lomalloc ${GMP_LIBS}
     51test_g_LDADD = libcoeffs_g.a -lresources_g -lreporter_g -lomalloc_debug ${GMP_LIBS}
    5152
    5253

  • libpolys/coeffs/configure.ac

    rcf5c05 rab4f17  
    77AC_CONFIG_SRCDIR([coeffs.h])
    88AC_CONFIG_HEADERS([config.h])
     9AC_CONFIG_MACRO_DIR([../../m4])
    910
    1011#check for host:
    … …  
    2425
    2526# Checks for libraries.
     27LB_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)]))
    2628
    2729# Checks for header files.

  • libpolys/configure.ac

    • Property mode changed from 100755 to 100644

  • libpolys/polys/Makefile.am

    rcf5c05 rab4f17  
    1 ACLOCAL_AMFLAGS = -I m4
     1ACLOCAL_AMFLAGS = -I m4 -I ../../m4
    22CXXTEMPLFLAGS   = -fno-implicit-templates --no-exceptions
    33
    … …  
    1414AM_CXXFLAGS     = ${PIPE} ${CXXTEMPLFLAGS}
    1515
    16 INCLUDES        = -I${top_srcdir}/.. -I${top_srcdir}/../.. -I${top_builddir}/.. -I${srcdir} -I${includedir}
     16INCLUDES        = -I${top_srcdir}/.. -I${top_srcdir}/../.. -I${top_builddir}/.. -I${srcdir} -I${includedir} ${GMP_CFLAGS}
    1717AM_LDFLAGS      = -L${top_builddir}/../coeffs -L${top_builddir}/../reporter -L${top_builddir}/../resources -L${top_builddir}/../../omalloc -L${builddir}
    1818

  • libpolys/polys/configure.ac

    rcf5c05 rab4f17  
    88AC_CONFIG_SRCDIR([pDebug.cc])
    99AC_CONFIG_HEADERS([config.h])
    10 AC_CONFIG_MACRO_DIR([m4])
     10AC_CONFIG_MACRO_DIR([m4],[../../m4])
    1111
    1212# Checks for programs.
    … …  
    2020
    2121# Checks for libraries.
     22LB_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)]))
     23
    2224
    2325# Checks for header files.
Note: See TracChangeset for help on using the changeset viewer.