diff options
| author | garyscavone <garyscavone@users.noreply.github.com> | 2016-02-13 13:10:12 -0500 |
|---|---|---|
| committer | garyscavone <garyscavone@users.noreply.github.com> | 2016-02-13 13:10:12 -0500 |
| commit | 1aa4d04add81f62333d281c129b2cc20b734a9a9 (patch) | |
| tree | 221484fbce1ed04b294121b6f45fda84cfe7caab | |
| parent | 39fb73f32ef04efbe2861dd2924b431a40a44ebe (diff) | |
| parent | d162da85675eed0fe549c4c201930b06dd4b206b (diff) | |
Merge pull request #66 from radarsat1/autotools
A couple of not very urgent patches to configure.ac and autogen.sh.
| -rwxr-xr-x | autogen.sh | 8 | ||||
| -rw-r--r-- | configure.ac | 10 |
2 files changed, 4 insertions, 14 deletions
@@ -21,6 +21,10 @@ fi exit 1 } +# Make some directories required by automake, if they don't exist +if ! [ -d config ]; then mkdir -v config; fi +if ! [ -d m4 ]; then mkdir -v m4; fi + if ! autoreconf --version </dev/null >/dev/null 2>&1 then @@ -67,10 +71,6 @@ if test "$DIE" -eq 1; then exit 1 fi -# Make some directories required by automake, if they don't exist -if ! [ -d config ]; then mkdir -v config; fi -if ! [ -d m4 ]; then mkdir -v m4; fi - case $CC in xlc ) am_opt=--include-deps;; diff --git a/configure.ac b/configure.ac index 1fee36d..39b532c 100644 --- a/configure.ac +++ b/configure.ac @@ -101,16 +101,6 @@ AC_CONFIG_LINKS( [doc/images/mcgill.gif:doc/images/mcgill.gif] ) # Checks for package options and external software AC_CANONICAL_HOST -AC_SUBST( sharedlib, ["librtmidi.so"] ) -AC_SUBST( sharedname, ["librtmidi.so.\$(RELEASE)"] ) -AC_SUBST( libflags, ["-shared -Wl,-soname,\$(SHARED).\$(MAJOR) -o \$(SHARED).\$(RELEASE)"] ) -case $host in - *-apple*) - AC_SUBST( sharedlib, ["librtmidi.dylib"] ) - AC_SUBST( sharedname, ["librtmidi.\$(RELEASE).dylib"] ) - AC_SUBST( libflags, ["-dynamiclib -o librtmidi.\$(RELEASE).dylib"] ) -esac - AC_SUBST( api, [""] ) AC_SUBST( req, [""] ) AC_MSG_CHECKING(for MIDI API) |
