diff options
| -rw-r--r-- | Makefile.in | 6 | ||||
| -rwxr-xr-x | configure | 12 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | jim.h.in (renamed from jim.h) | 4 |
4 files changed, 14 insertions, 14 deletions
diff --git a/Makefile.in b/Makefile.in index 3964452..0dfa2d5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -3,7 +3,6 @@ SIZE ?= size # Configuration -jim_nofork := @JIM_NOFORK@ jim_libtype := @JIM_LIBTYPE@ SH_CFLAGS ?= @SH_CFLAGS@ SH_LDFLAGS ?= @SH_LDFLAGS@ @@ -16,12 +15,9 @@ CFLAGS += -DTCL_LIBRARY=\"/lib/tcl6\" CFLAGS += -DJIM_TCL_COMPAT -DJIM_REFERENCES -CFLAGS += -Wall -g -Os $(OPTIM) -I@SRCDIR@ @EXTRA_CFLAGS@ +CFLAGS += -DHAVE_CONFIGURE -Wall -g $(OPTIM) -I@SRCDIR@ @EXTRA_CFLAGS@ VPATH := @SRCDIR@ -ifdef jim_nofork - CFLAGS += -DNO_FORK -endif ifeq ($(jim_libtype),static) # Emulate tinytcl LIBJIM := libtcl6.a @@ -597,7 +597,6 @@ SRCDIR EXTRA_CFLAGS JIM_LIBTYPE JIM_EXTENSIONS -JIM_NOFORK SH_LDFLAGS SH_CFLAGS host_os @@ -611,6 +610,7 @@ build EGREP GREP CPP +HAVE_LONG_LONG SET_MAKE OBJEXT EXEEXT @@ -3260,7 +3260,8 @@ cat >>confdefs.h <<_ACEOF #define HAVE_LONG_LONG 1 _ACEOF -EXTRA_CFLAGS="$EXTRA_CFLAGS -DHAVE_LONG_LONG" +HAVE_LONG_LONG="#define HAVE_LONG_LONG" + fi @@ -3378,13 +3379,11 @@ if test "${enable_fork+set}" = set; then : if test "x$enableval" = "xno" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: * disabling fork" >&5 $as_echo "* disabling fork" >&6; } - JIM_NOFORK=1 + EXTRA_CFLAGS="-DJIM_NOFORK" fi fi -JIM_NOFORK=$JIM_NOFORK - # Check whether --enable-math was given. if test "${enable_math+set}" = set; then : enableval=$enable_math; @@ -3505,6 +3504,8 @@ fi ac_config_files="$ac_config_files Makefile" +ac_config_files="$ac_config_files jim.h" + cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -4200,6 +4201,7 @@ for ac_config_target in $ac_config_targets do case $ac_config_target in "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "jim.h") CONFIG_FILES="$CONFIG_FILES jim.h" ;; *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac diff --git a/configure.ac b/configure.ac index 3c3891e..45f55ab 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ AC_PROG_CC AC_PROG_MAKE_SET # Checks for types -AC_CHECK_TYPES(long long,EXTRA_CFLAGS="$EXTRA_CFLAGS -DHAVE_LONG_LONG") +AC_CHECK_TYPES(long long,AC_SUBST(HAVE_LONG_LONG,["#define HAVE_LONG_LONG"])) # Shared library support. Because we don't believe in automake! AC_CANONICAL_HOST @@ -27,11 +27,10 @@ AC_ARG_ENABLE(fork, [ if test "x$enableval" = "xno" ; then AC_MSG_RESULT(* disabling fork) - JIM_NOFORK=1 + EXTRA_CFLAGS="-DJIM_NOFORK" fi ], ) -AC_SUBST(JIM_NOFORK,$JIM_NOFORK) AC_ARG_ENABLE(math, [ --enable-math include support for math functions], [ @@ -79,4 +78,5 @@ AC_SUBST(SRCDIR,`dirname $0`) AC_CHECK_LIB(dl, dlopen,AC_SUBST(LIBDL,-ldl)) AC_CONFIG_FILES([Makefile]) +AC_CONFIG_FILES([jim.h]) AC_OUTPUT @@ -82,7 +82,9 @@ extern "C" { * autoconf (configure) will set these * ---------------------------------------------------------------------------*/ -/* #define HAVE_LONG_LONG */ +#ifdef HAVE_CONFIGURE +@HAVE_LONG_LONG@ +#endif /* ----------------------------------------------------------------------------- * Compiler specific fixes. |