cddlib/cddlib-flags.diff

57 lines
1.7 KiB
Diff
Raw Normal View History

From: Jan Engelhardt <jengelh@medozas.de>
Date: 2011-09-26 14:49:00.979547210 +0200
Replace old variable names by new ones.
---
configure.in | 5 +++--
src-gmp/Makefile.am | 6 +++---
src/Makefile.am | 4 ++--
3 files changed, 8 insertions(+), 7 deletions(-)
Index: cddlib-094g/configure.in
===================================================================
--- cddlib-094g.orig/configure.in
+++ cddlib-094g/configure.in
@@ -1,11 +1,12 @@
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 subdir-objects])
dnl Checks for programs.
AC_PROG_CC
+AM_PROG_CC_C_O
AC_PROG_INSTALL
LT_INIT
Index: cddlib-094g/src-gmp/Makefile.am
===================================================================
--- cddlib-094g.orig/src-gmp/Makefile.am
+++ cddlib-094g/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-094g/src/Makefile.am
===================================================================
--- cddlib-094g.orig/src/Makefile.am
+++ cddlib-094g/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