aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.in7
-rwxr-xr-xconfigure4
-rwxr-xr-xconfigure.ac2
-rw-r--r--jim-aio.c1
-rw-r--r--jim-array.c2
-rw-r--r--jim-bio.c4
-rw-r--r--jim-clock.c1
-rw-r--r--jim-config.h.in (renamed from jimautoconfext.h.in)0
-rw-r--r--jim-eventloop.c1
-rw-r--r--jim-exec.c1
-rw-r--r--jim-file.c1
-rw-r--r--jim-load.c3
-rw-r--r--jim-package.c4
-rw-r--r--jim-posix.c1
-rw-r--r--jim-readdir.c1
-rw-r--r--jim-readline.c1
-rw-r--r--jim-signal.c1
-rw-r--r--jim-win32compat.c1
-rw-r--r--jim.h2
19 files changed, 23 insertions, 15 deletions
diff --git a/Makefile.in b/Makefile.in
index 697a1ad..8eb4274 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -68,8 +68,9 @@ install: all docs $(EXTENSION_TCL)
install $(LIBJIM) $(DESTDIR)/lib
install README.extensions $(EXTENSION_MODS) $(EXTENSION_TCL) $(DESTDIR)/lib/jim
install -d $(DESTDIR)/include
- install @SRCDIR@/jim.h @SRCDIR@/jim-*.h $(DESTDIR)/include
- install jimautoconfext.h $(DESTDIR)/include/jimautoconf.h
+ install @SRCDIR@/jim.h @SRCDIR@/jim-eventloop.h @SRCDIR@/jim-nvp.h @SRCDIR@/jim-signal.h \
+ @SRCDIR@/jim-subcmd.h @SRCDIR@/jim-win32compat.h $(DESTDIR)/include
+ install jim-config.h $(DESTDIR)/include
install -d $(DESTDIR)/doc/jim
install Tcl.html $(DESTDIR)/doc/jim
@@ -99,7 +100,7 @@ clean:
if [ -f .clean ]; then rm -f `cat .clean` .clean; fi
distclean: clean
- rm -f jimautoconf.h jimautoconfext.h Makefile config.status config.log
+ rm -f jimautoconf.h jim-config.h Makefile config.status config.log
rm -rf autom4te.cache
ship: Tcl.html
diff --git a/configure b/configure
index 4335968..780c765 100755
--- a/configure
+++ b/configure
@@ -4256,7 +4256,7 @@ PLATFORM_OS=`uname -s`
PLATFORM_PLATFORM=unix
-ac_config_files="$ac_config_files Makefile jimautoconfext.h"
+ac_config_files="$ac_config_files Makefile jim-config.h"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -4961,7 +4961,7 @@ do
case $ac_config_target in
"jimautoconf.h") CONFIG_HEADERS="$CONFIG_HEADERS jimautoconf.h" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
- "jimautoconfext.h") CONFIG_FILES="$CONFIG_FILES jimautoconfext.h" ;;
+ "jim-config.h") CONFIG_FILES="$CONFIG_FILES jim-config.h" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
diff --git a/configure.ac b/configure.ac
index c799a11..7554ecc 100755
--- a/configure.ac
+++ b/configure.ac
@@ -353,5 +353,5 @@ AC_SUBST(SRCDIR,`dirname $0`)
AC_SUBST(PLATFORM_OS,`uname -s`)
AC_SUBST(PLATFORM_PLATFORM,unix)
-AC_CONFIG_FILES([Makefile jimautoconfext.h])
+AC_CONFIG_FILES([Makefile jim-config.h])
AC_OUTPUT
diff --git a/jim-aio.c b/jim-aio.c
index 2de776f..8489f95 100644
--- a/jim-aio.c
+++ b/jim-aio.c
@@ -45,6 +45,7 @@
#include <fcntl.h>
#include "jim.h"
+#include "jimautoconf.h"
#if !defined(JIM_ANSIC)
#include <sys/socket.h>
diff --git a/jim-array.c b/jim-array.c
index 2d0d081..c9efe6b 100644
--- a/jim-array.c
+++ b/jim-array.c
@@ -1,6 +1,6 @@
/*
- * Implements the file command for jim
+ * Implements the array command for jim
*
* (c) 2008 Steve Bennett <steveb@workware.net.au>
*
diff --git a/jim-bio.c b/jim-bio.c
index 245374d..fba3040 100644
--- a/jim-bio.c
+++ b/jim-bio.c
@@ -28,8 +28,8 @@
#include <time.h>
#include <errno.h>
-#include <jim.h>
-#include <jim-subcmd.h>
+#include "jim.h"
+#include "jim-subcmd.h"
static int hex2char(const char *hex)
{
diff --git a/jim-clock.c b/jim-clock.c
index 67698b6..b342f31 100644
--- a/jim-clock.c
+++ b/jim-clock.c
@@ -15,6 +15,7 @@
#include <sys/time.h>
#include "jim.h"
+#include "jimautoconf.h"
#include "jim-subcmd.h"
static int clock_cmd_format(Jim_Interp *interp, int argc, Jim_Obj *const *argv)
diff --git a/jimautoconfext.h.in b/jim-config.h.in
index 2394bc5..2394bc5 100644
--- a/jimautoconfext.h.in
+++ b/jim-config.h.in
diff --git a/jim-eventloop.c b/jim-eventloop.c
index 7221c81..d41bd8d 100644
--- a/jim-eventloop.c
+++ b/jim-eventloop.c
@@ -39,6 +39,7 @@
**/
#include "jim.h"
+#include "jimautoconf.h"
#include "jim-eventloop.h"
/* POSIX includes */
diff --git a/jim-exec.c b/jim-exec.c
index 9f07cf6..1bd4235 100644
--- a/jim-exec.c
+++ b/jim-exec.c
@@ -24,6 +24,7 @@
#include <sys/wait.h>
#include "jim.h"
+#include "jimautoconf.h"
#include "jim-subcmd.h"
#include "jim-signal.h"
diff --git a/jim-file.c b/jim-file.c
index 9758380..34b7538 100644
--- a/jim-file.c
+++ b/jim-file.c
@@ -53,6 +53,7 @@
#include <sys/param.h>
#include "jim.h"
+#include "jimautoconf.h"
#include "jim-subcmd.h"
#ifndef MAXPATHLEN
diff --git a/jim-load.c b/jim-load.c
index 8d4e6c2..ce8e688 100644
--- a/jim-load.c
+++ b/jim-load.c
@@ -1,4 +1,5 @@
-#include <jim.h>
+#include "jim.h"
+#include "jimautoconf.h"
#include <string.h>
/* -----------------------------------------------------------------------------
diff --git a/jim-package.c b/jim-package.c
index 783ead6..a2ad93f 100644
--- a/jim-package.c
+++ b/jim-package.c
@@ -1,8 +1,8 @@
#include <unistd.h>
#include <string.h>
-#include <jim.h>
-#include <jim-subcmd.h>
+#include "jim.h"
+#include "jim-subcmd.h"
/* -----------------------------------------------------------------------------
* Packages handling
diff --git a/jim-posix.c b/jim-posix.c
index 4658c51..ba4c6d7 100644
--- a/jim-posix.c
+++ b/jim-posix.c
@@ -27,6 +27,7 @@
#include <errno.h>
#include "jim.h"
+#include "jimautoconf.h"
#ifdef HAVE_SYSINFO
#include <sys/sysinfo.h>
diff --git a/jim-readdir.c b/jim-readdir.c
index 13d5ad2..94cc1a4 100644
--- a/jim-readdir.c
+++ b/jim-readdir.c
@@ -50,7 +50,6 @@
#include <string.h>
#include <dirent.h>
-#define JIM_EXTENSION
#include "jim.h"
/*
diff --git a/jim-readline.c b/jim-readline.c
index 6ad3e41..f1690f0 100644
--- a/jim-readline.c
+++ b/jim-readline.c
@@ -18,7 +18,6 @@
* limitations under the License.
*/
-#define JIM_EXTENSION
#include "jim.h"
#include <readline/readline.h>
diff --git a/jim-signal.c b/jim-signal.c
index 1b1c258..458a328 100644
--- a/jim-signal.c
+++ b/jim-signal.c
@@ -10,6 +10,7 @@
#include <unistd.h>
#include "jim.h"
+#include "jimautoconf.h"
#include "jim-subcmd.h"
#include "jim-signal.h"
diff --git a/jim-win32compat.c b/jim-win32compat.c
index bbda937..7625a8a 100644
--- a/jim-win32compat.c
+++ b/jim-win32compat.c
@@ -1,4 +1,5 @@
#include <jim.h>
+#include "jimautoconf.h"
#ifdef HAVE_DLOPEN_COMPAT
void *dlopen(const char *path, int mode)
diff --git a/jim.h b/jim.h
index 5f36eaa..bbb30c7 100644
--- a/jim.h
+++ b/jim.h
@@ -82,7 +82,7 @@ extern "C" {
#include <jim-win32compat.h>
#ifndef HAVE_NO_AUTOCONF
-#include <jimautoconf.h>
+#include <jim-config.h>
#endif
/* -----------------------------------------------------------------------------
generated by cgit v1.1 at 2024-07-19 09:43:35 +0000