aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorN.N. <matju@users.sourceforge.net>2009-06-10 20:50:05 +0000
committerN.N. <matju@users.sourceforge.net>2009-06-10 20:50:05 +0000
commit86501552df914cbe95b7e2a0a69c1cb5078d938c (patch)
treef3644c460b08cebc4527a7b906be65f06fc5ea4c
parenta5a9290758d0b4d236202a36a49aff0ae899aee4 (diff)
rename env var OS to USE_OS because OS is already preset on Windows NT (name conflict)
svn path=/trunk/; revision=11741
-rwxr-xr-xdesiredata/src/configure12
-rw-r--r--desiredata/src/configure.in12
2 files changed, 12 insertions, 12 deletions
diff --git a/desiredata/src/configure b/desiredata/src/configure
index d49d368c..16cfc6ae 100755
--- a/desiredata/src/configure
+++ b/desiredata/src/configure
@@ -5296,11 +5296,11 @@ MIDISRC="s_midi_none.c"
WLIB=""
STRIP="meuhhhhh"
-if test "$OS" = ""; then
- OS=$(uname -s)
+if test "$USE_OS" = ""; then
+ USE_OS=$(uname -s)
fi
-if test $OS = Linux; then
+if test $USE_OS = Linux; then
LDFLAGS="-Wl,--export-dynamic "
EXT=pd_linux
LIBSUFFIX=.so
@@ -5314,7 +5314,7 @@ if test $OS = Linux; then
WSTRIP=""
fi
-if test $OS = Darwin; then
+if test $USE_OS = Darwin; then
LDFLAGS=""
EXT=pd_darwin
LIBSUFFIX=.dylib
@@ -5342,7 +5342,7 @@ if test $OS = Darwin; then
WSTRIP=""
fi
-if test $(echo $OS | cut -f1 -d_) = CYGWIN; then
+if test $(echo $USE_OS | cut -f1 -d_) = CYGWIN; then
LDFLAGS="-Wl,--export-dynamic "
EXT=dll
LIBSUFFIX=.dll
@@ -5354,7 +5354,7 @@ if test $(echo $OS | cut -f1 -d_) = CYGWIN; then
WSTRIP=""
fi
-if test $(echo $OS | cut -f1 -d_) = MINGW32; then
+if test $(echo $USE_OS | cut -f1 -d_) = MINGW32; then
LDFLAGS="-lm -lpthreadGC2 -lwsock32 -lwinmm -lole32 -L../src -lpd"
# LDFLAGS="-lm /home/matju/pthreads-mingw/lib/libpthreadGC2.a -lwsock32 -lwinmm -lole32 -L../src -lpd"
EXT=dll
diff --git a/desiredata/src/configure.in b/desiredata/src/configure.in
index 256b280f..d4ba4012 100644
--- a/desiredata/src/configure.in
+++ b/desiredata/src/configure.in
@@ -73,11 +73,11 @@ MIDISRC="s_midi_none.c"
WLIB=""
STRIP="meuhhhhh"
-if test "$OS" = ""; then
- OS=$(uname -s)
+if test "$USE_OS" = ""; then
+ USE_OS=$(uname -s)
fi
-if test $OS = Linux; then
+if test $USE_OS = Linux; then
LDFLAGS="-Wl,--export-dynamic "
EXT=pd_linux
LIBSUFFIX=.so
@@ -91,7 +91,7 @@ if test $OS = Linux; then
WSTRIP=""
fi
-if test $OS = Darwin; then
+if test $USE_OS = Darwin; then
LDFLAGS=""
EXT=pd_darwin
LIBSUFFIX=.dylib
@@ -119,7 +119,7 @@ if test $OS = Darwin; then
WSTRIP=""
fi
-if test $(echo $OS | cut -f1 -d_) = CYGWIN; then
+if test $(echo $USE_OS | cut -f1 -d_) = CYGWIN; then
LDFLAGS="-Wl,--export-dynamic "
EXT=dll
LIBSUFFIX=.dll
@@ -131,7 +131,7 @@ if test $(echo $OS | cut -f1 -d_) = CYGWIN; then
WSTRIP=""
fi
-if test $(echo $OS | cut -f1 -d_) = MINGW32; then
+if test $(echo $USE_OS | cut -f1 -d_) = MINGW32; then
LDFLAGS="-lm -lpthreadGC2 -lwsock32 -lwinmm -lole32 -L../src -lpd"
# LDFLAGS="-lm /home/matju/pthreads-mingw/lib/libpthreadGC2.a -lwsock32 -lwinmm -lole32 -L../src -lpd"
EXT=dll