summaryrefslogtreecommitdiffhomepage
path: root/mixutils
diff options
context:
space:
mode:
Diffstat (limited to 'mixutils')
-rw-r--r--mixutils/Makefile.am6
-rw-r--r--mixutils/mixasm.c7
-rw-r--r--mixutils/mixvm.c7
3 files changed, 15 insertions, 5 deletions
diff --git a/mixutils/Makefile.am b/mixutils/Makefile.am
index 01d6378..9d72f95 100644
--- a/mixutils/Makefile.am
+++ b/mixutils/Makefile.am
@@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in
-# Copyright (C) 2000 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001 Free Software Foundation, Inc.
#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
@@ -10,8 +10,8 @@
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-INCLUDES = -I$(includedir)
-LDADD = $(top_builddir)/mixlib/libmix.a $(INTLLIBS)
+INCLUDES = -I$(includedir)
+LDADD = $(top_builddir)/mixlib/libmix.a $(top_builddir)/lib/libreplace.a
bin_PROGRAMS = mixasm mixvm
mixasm_SOURCES = mixasm.c mixasm_comp.h mixasm_comp.c
diff --git a/mixutils/mixasm.c b/mixutils/mixasm.c
index 64f0f3d..c8ece5b 100644
--- a/mixutils/mixasm.c
+++ b/mixutils/mixasm.c
@@ -23,7 +23,12 @@
#include <stdlib.h>
#include <stdio.h>
-#include <getopt.h>
+
+#ifdef HAVE_GETOPT_LONG
+# include <getopt.h>
+#else
+# include <lib/getopt.h>
+#endif /* HAVE_GETOPT_LONG */
#include "mixasm_comp.h"
diff --git a/mixutils/mixvm.c b/mixutils/mixvm.c
index eafc8a0..d2d64c3 100644
--- a/mixutils/mixvm.c
+++ b/mixutils/mixvm.c
@@ -27,7 +27,12 @@
#include <stdlib.h>
#include <stdio.h>
-#include <getopt.h>
+
+#ifdef HAVE_GETOPT_LONG
+# include <getopt.h>
+#else
+# include <lib/getopt.h>
+#endif /* HAVE_GETOPT_LONG */
extern void
mix_vmloop (const gchar *code_file, gboolean use_emacs);