Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update configure script to check for swig >= 3 #1554

Merged
merged 1 commit into from
Aug 28, 2023
Merged

Update configure script to check for swig >= 3 #1554

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions autoconf/configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ dnl To generate a new top level configure script from this autoconf directory
dnl 1. aclocal
dnl 2. autoconf -o ../configure

AC_INIT([Trick],[17+])
AC_INIT([Trick],[19.6+])
AC_LANG(C++)

AC_CONFIG_AUX_DIR([autoconf])
Expand Down Expand Up @@ -188,7 +188,7 @@ AC_SUBST([PYTHON_EXTRA_LIBS])
TR_PREPEND_PATH()
AC_PATH_PROG(GNUPLOT, gnuplot, nognuplot)
AS_IF([test "$ac_cv_path_GNUPLOT" = "nognuplot"],AC_MSG_NOTICE([could not find gnuplot]),[])
TR_SWIG_BIN([2.0])
TR_SWIG_BIN([3.0])
TR_JAVA

AX_PTHREAD()
Expand Down
4 changes: 2 additions & 2 deletions autoconf/m4/tr_swig_bin.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ AC_DEFUN([TR_SWIG_BIN],[
[
TEMP_PATH="${PATH}"
PATH="$withval:${PATH}"
AX_PKG_SWIG($1, [], [AC_MSG_ERROR([Trick requires SWIG version >= 2.0])])
AX_PKG_SWIG($1, [], [AC_MSG_ERROR([Trick requires SWIG version >= 3.0])])
PATH="${TEMP_PATH}"
],
[AX_PKG_SWIG($1, [], [AC_MSG_ERROR([Trick requires SWIG version >= 2.0])])]
[AX_PKG_SWIG($1, [], [AC_MSG_ERROR([Trick requires SWIG version >= 3.0])])]
)
])
46 changes: 23 additions & 23 deletions configure
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 30 additions & 0 deletions docs/developer_docs/Configure.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
| [Home](/trick) → [Developer Docs](Developer-Docs-Home) → Configure |
|------------------------------------------------------------------|


# Updating the configure script

Trick uses `autoconf` to find and version check dependencies. The autoconf scripts live in the `autoconf/` directory, and the generated script that the user runs is `configure` in the Trick home directory.


## How to update the configure script

The configure script run by the user is generated by autoconf. To update it -

1. Make changes in the `autoconf/` directory, likely to `configure.ac` and macros in the `m4/` directory
1. From the `autoconf/` directory, run:
```
aclocal
autoconf -o ../configure
```


### Notes

If you get an error message that looks like

```
possibly undefined macro: AC_MSG_ERROR
```

Install the package `autoconf-archive`.
1 change: 1 addition & 0 deletions docs/developer_docs/Developer-Docs-Home.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Link documentation for Trick internals, processes, and plans here.
- [Tooling and Sanitizers](Tooling-and-Sanitizers)
- [Python Environment](Python-Environment-Issues)
- [CI](CI)
- [Configure Script](Configure)

Old design documentation - may or may not be up to date

Expand Down