From 642c7112899d63e9d3b54745bd89ae1e9b747bb7 Mon Sep 17 00:00:00 2001 From: Ralf Gerlich Date: Mon, 2 Feb 2009 10:10:32 +0100 Subject: [PATCH] Ensure that TerraGear builds under Linux with Fred's changes. --- src/Prep/Terra/Makefile.am | 2 +- src/Prep/Terra/getopt.c | 2 ++ src/Prep/TerraFit/Makefile.am | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Prep/Terra/Makefile.am b/src/Prep/Terra/Makefile.am index 648a151a..c0ce4e58 100644 --- a/src/Prep/Terra/Makefile.am +++ b/src/Prep/Terra/Makefile.am @@ -16,7 +16,7 @@ libTerra_a_SOURCES = \ Vec2.h Vec3.h terra_SOURCES = \ - cmdline.cc greedy.cc output.cc terra.cc terra.h version.h + cmdline.cc getopt.c getopt.h greedy.cc output.cc terra.cc terra.h version.h terra_LDADD = libTerra.a diff --git a/src/Prep/Terra/getopt.c b/src/Prep/Terra/getopt.c index 4203cdb5..202d9432 100644 --- a/src/Prep/Terra/getopt.c +++ b/src/Prep/Terra/getopt.c @@ -30,7 +30,9 @@ long-named option. Because this is not POSIX.2 compliant, it is being phased out. */ #undef GETOPT_COMPAT +#ifndef __STDC__ #define __STDC__ 1 +#endif /* This version of `getopt' appears to the caller like standard Unix `getopt' but it behaves differently for the user, since it allows the user diff --git a/src/Prep/TerraFit/Makefile.am b/src/Prep/TerraFit/Makefile.am index 548eda57..17836fff 100644 --- a/src/Prep/TerraFit/Makefile.am +++ b/src/Prep/TerraFit/Makefile.am @@ -4,7 +4,7 @@ bin_PROGRAMS = terrafit terrafit_SOURCES = terrafit.cc terrafit_LDADD = $(top_builddir)/src/Prep/Terra/libTerra.a \ $(top_builddir)/src/Lib/Array/libArray.a \ - -lsgbucket -lsgstructure -lsgmisc -lsgdebug -lz + -lsgbucket -lsgstructure -lsgmisc -lsgdebug -lz -lplibul EXTRA_DIST = terrafit.README terrafit.py.in