diff options
author | Steve Bennett <steveb@workware.net.au> | 2010-11-09 07:28:47 +1000 |
---|---|---|
committer | Steve Bennett <steveb@workware.net.au> | 2010-11-09 07:28:47 +1000 |
commit | 5a9c9cdc1a0add1d0e6e63e64d5d7d7febc6d749 (patch) | |
tree | 72f625d13c553a613283bd58a3325e009f399c35 | |
parent | b7a3951c0046491a62399fc51fe809e24e5eb8b7 (diff) | |
download | jimtcl-5a9c9cdc1a0add1d0e6e63e64d5d7d7febc6d749.zip jimtcl-5a9c9cdc1a0add1d0e6e63e64d5d7d7febc6d749.tar.gz jimtcl-5a9c9cdc1a0add1d0e6e63e64d5d7d7febc6d749.tar.bz2 |
Allow jim to be used as an autoconf subdir
Ensure that no public headers include the autoconf
header, jimautoconf.h, as it leads to problems
with redefined symbols.
Signed-off-by: Steve Bennett <steveb@workware.net.au>
-rw-r--r-- | Makefile.in | 7 | ||||
-rwxr-xr-x | configure | 4 | ||||
-rwxr-xr-x | configure.ac | 2 | ||||
-rw-r--r-- | jim-aio.c | 1 | ||||
-rw-r--r-- | jim-array.c | 2 | ||||
-rw-r--r-- | jim-bio.c | 4 | ||||
-rw-r--r-- | jim-clock.c | 1 | ||||
-rw-r--r-- | jim-config.h.in (renamed from jimautoconfext.h.in) | 0 | ||||
-rw-r--r-- | jim-eventloop.c | 1 | ||||
-rw-r--r-- | jim-exec.c | 1 | ||||
-rw-r--r-- | jim-file.c | 1 | ||||
-rw-r--r-- | jim-load.c | 3 | ||||
-rw-r--r-- | jim-package.c | 4 | ||||
-rw-r--r-- | jim-posix.c | 1 | ||||
-rw-r--r-- | jim-readdir.c | 1 | ||||
-rw-r--r-- | jim-readline.c | 1 | ||||
-rw-r--r-- | jim-signal.c | 1 | ||||
-rw-r--r-- | jim-win32compat.c | 1 | ||||
-rw-r--r-- | jim.h | 2 |
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 @@ -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 @@ -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> * @@ -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 */ @@ -24,6 +24,7 @@ #include <sys/wait.h> #include "jim.h" +#include "jimautoconf.h" #include "jim-subcmd.h" #include "jim-signal.h" @@ -53,6 +53,7 @@ #include <sys/param.h> #include "jim.h" +#include "jimautoconf.h" #include "jim-subcmd.h" #ifndef MAXPATHLEN @@ -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) @@ -82,7 +82,7 @@ extern "C" { #include <jim-win32compat.h> #ifndef HAVE_NO_AUTOCONF -#include <jimautoconf.h> +#include <jim-config.h> #endif /* ----------------------------------------------------------------------------- |