jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed preprocessor definitions from having to be specified on the command line when building the c++ files. They are now defined in swigconfig.h.

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@4794 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2003-05-19 14:07:41 +00:00
commit 1006a83d97
4 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
SWIG/.cvsignore
View file

@ -1,5 +1,6 @@
aclocal.m4 aclocal.m4
config.* config.*
libtool
Makefile Makefile
swig* swig*
*.tar.gz *.tar.gz

1
SWIG/Makefile.in
View file

@ -5,7 +5,6 @@
prefix = @prefix@ prefix = @prefix@
exec_prefix = @exec_prefix@ exec_prefix = @exec_prefix@
srcdir = @srcdir@ srcdir = @srcdir@
libdir = @libdir@
############################################################################## ##############################################################################
# Compiler and system configuration # Compiler and system configuration

4
SWIG/Source/Makefile.am
View file

@ -6,9 +6,7 @@ AUTOMAKE_OPTIONS = foreign nostdinc subdir-objects 1.7.2
SOURCE_DIR=$(top_srcdir)/Source SOURCE_DIR=$(top_srcdir)/Source
BUILD_SOURCE_DIR=$(top_builddir)/Source BUILD_SOURCE_DIR=$(top_builddir)/Source
SWIG_CXX_DEFS = -DSWIG_LIB=\"$(swig_lib)\" \ SWIG_CXX_DEFS = @SWILL@
-DLIBDIR=\"$(libdir)\" \
-DRELEASE_SUFFIX=\"$(release_suffix)\" @SWILL@
AM_CFLAGS = -I$(BUILD_SOURCE_DIR)/Include \ AM_CFLAGS = -I$(BUILD_SOURCE_DIR)/Include \
-I$(BUILD_SOURCE_DIR)/CParse \ -I$(BUILD_SOURCE_DIR)/CParse \

12
SWIG/configure.in
View file

@ -9,12 +9,11 @@ AC_CANONICAL_HOST
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE
dnl Some extra defines for the config file dnl Some extra defines for the config file
AH_TOP([ AH_BOTTOM([
/* Default language */ /* Default language */
#define SWIG_LANG "-tcl" #define SWIG_LANG "-tcl"
/* Values returned by SWIG when invoked with the -ldflags option. /* Values returned by SWIG when invoked with the -ldflags option */
* Define LIBDIR and RELEASESUFFIX on the compilation command line in the Makefile when needed. */
#define SWIG_GUILE_RUNTIME "-L" LIBDIR " -lswigguile" RELEASE_SUFFIX #define SWIG_GUILE_RUNTIME "-L" LIBDIR " -lswigguile" RELEASE_SUFFIX
#define SWIG_MZSCHEME_RUNTIME "-L" LIBDIR " -lswigmz" RELEASE_SUFFIX #define SWIG_MZSCHEME_RUNTIME "-L" LIBDIR " -lswigmz" RELEASE_SUFFIX
#define SWIG_OCAML_RUNTIME "-L" LIBDIR " -lswigocaml" RELEASE_SUFFIX #define SWIG_OCAML_RUNTIME "-L" LIBDIR " -lswigocaml" RELEASE_SUFFIX
@ -40,6 +39,9 @@ AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
AC_DEFINE_UNQUOTED(SWIG_CXX, ["$CXX"], [Compiler that built SWIG]) AC_DEFINE_UNQUOTED(SWIG_CXX, ["$CXX"], [Compiler that built SWIG])
AC_DEFINE_UNQUOTED(SWIG_PLATFORM, ["$build"], [Platform that SWIG is built for])
AC_DEFINE_DIR(LIBDIR, libdir, [Runtime library installation directory])
dnl Checks for header files. dnl Checks for header files.
AC_HEADER_STDC AC_HEADER_STDC
@ -1321,8 +1323,9 @@ AC_SUBST(ac_aux_dir)
# Configure SWIG_LIB path # Configure SWIG_LIB path
AC_ARG_WITH(swiglibdir,[ --with-swiglibdir=DIR Put SWIG system-independent libraries into DIR.], AC_ARG_WITH(swiglibdir,[ --with-swiglibdir=DIR Put SWIG system-independent libraries into DIR.],
[swig_lib="$withval"], [swig_lib="\$(libdir)/swig1.3"]) [swig_lib="$withval"], [swig_lib="${libdir}/swig1.3"])
AC_SUBST(swig_lib) AC_SUBST(swig_lib)
AC_DEFINE_DIR(SWIG_LIB, swig_lib, [Directory for SWIG system-independent libraries])
# Configure RELEASESUFFIX (for setups having both SWIG 1.1 and 1.3 on a system...) # Configure RELEASESUFFIX (for setups having both SWIG 1.1 and 1.3 on a system...)
@ -1330,6 +1333,7 @@ AC_ARG_WITH(release-suffix,
[ --with-release-suffix=SUFFIX Attach SUFFIX to the binary and the runtime libs. ], [ --with-release-suffix=SUFFIX Attach SUFFIX to the binary and the runtime libs. ],
[release_suffix="$withval"], [release_suffix=""]) [release_suffix="$withval"], [release_suffix=""])
AC_SUBST(release_suffix) AC_SUBST(release_suffix)
AC_DEFINE_UNQUOTED(RELEASE_SUFFIX, "$release_suffix", [Executable and runtime libraries release suffix for co-existence with older versions])
release_suffix_libtool= release_suffix_libtool=
if test -n "$release_suffix"; then if test -n "$release_suffix"; then