From: Jan Engelhardt Date: 2011-09-26 14:49:00.979547210 +0200 Upstream: dead Replace old variable names by new ones. --- configure.in | 7 ++++--- lib-src-gmp/Makefile.am | 2 +- src-gmp/Makefile.am | 6 +++--- src/Makefile.am | 4 ++-- 4 files changed, 10 insertions(+), 9 deletions(-) Index: cddlib-094f/configure.in =================================================================== --- cddlib-094f.orig/configure.in +++ cddlib-094f/configure.in @@ -1,8 +1,8 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT() +AC_INIT([cddlib], [0.94]) dnl Init automake. -AM_INIT_AUTOMAKE(cddlib, 0.94) +AM_INIT_AUTOMAKE([-Wall foreign]) dnl Checks for programs. AC_PROG_CC @@ -26,4 +26,5 @@ AC_C_CONST dnl Checks for library functions. -AC_OUTPUT(lib-src/Makefile src/Makefile lib-src-gmp/Makefile src-gmp/Makefile Makefile) +AC_CONFIG_FILES([lib-src/Makefile src/Makefile lib-src-gmp/Makefile src-gmp/Makefile Makefile]) +AC_OUTPUT Index: cddlib-094f/lib-src-gmp/Makefile.am =================================================================== --- cddlib-094f.orig/lib-src-gmp/Makefile.am +++ cddlib-094f/lib-src-gmp/Makefile.am @@ -25,5 +25,5 @@ cddtypes_f.h \ setoper.h AM_CPPFLAGS = -DGMPRATIONAL -INCLUDES = -I$(gmpincludedir) +AM_CPPFLAGS += -I$(gmpincludedir) Index: cddlib-094f/src-gmp/Makefile.am =================================================================== --- cddlib-094f.orig/src-gmp/Makefile.am +++ cddlib-094f/src-gmp/Makefile.am @@ -31,6 +31,6 @@ testlp3_gmp_SOURCES = tes LDADD = ../lib-src-gmp/libcddgmp.la AM_LDFLAGS = -L$(gmplibdir) -INCLUDES = -I../lib-src-gmp -INCLUDES += -I$(gmpincludedir) -AM_CPPFLAGS = -DGMPRATIONAL +AM_CPPFLAGS = -I../lib-src-gmp +AM_CPPFLAGS += -I$(gmpincludedir) +AM_CPPFLAGS += -DGMPRATIONAL Index: cddlib-094f/src/Makefile.am =================================================================== --- cddlib-094f.orig/src/Makefile.am +++ cddlib-094f/src/Makefile.am @@ -30,5 +30,5 @@ testlp3_SOURCES = testlp3 # cddmathlink_SOURCES = cddmathlink.c cddmlio.h cddmlio.c LDADD = ../lib-src/libcdd.la -INCLUDES = -I../lib-src -AM_CPPFLAGS = -UGMPRATIONAL +AM_CPPFLAGS = -I../lib-src +AM_CPPFLAGS += -UGMPRATIONAL