aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIOhannes m zmölnig <zmoelnig@users.sourceforge.net>2005-12-15 15:46:18 +0000
committerIOhannes m zmölnig <zmoelnig@users.sourceforge.net>2005-12-15 15:46:18 +0000
commit8ec8d87031f0bea6de99b225fa952cd4ad498383 (patch)
tree948273aa3da0159b6d46b6866459f238fe597f80
parent66195341857a5c19a52b17468636eca7bc62f3ea (diff)
added "--with-pd" flag (to specify paths for both INCLUDE and LIBS)
added "--disable-PIC" flag (to disable compilation with PIC (gives loads of warnings with mingw) svn path=/trunk/externals/zexy/; revision=4223
-rw-r--r--README.txt3
-rw-r--r--src/configure.ac21
2 files changed, 17 insertions, 7 deletions
diff --git a/README.txt b/README.txt
index f1de713..f20cbc1 100644
--- a/README.txt
+++ b/README.txt
@@ -79,8 +79,7 @@ to compile:
+ cross-compilation for windows on linux using mingw (assumes that the
crosscompiler is "i586-mingw32msvc-cc")
#> ./configure --host=i586-mingw32msvc --with-extension=dll \
- --includedir=/path/to/win/pd/src/ --libdir=/path/to/win/pd/bin/
-
+ --with-pd=/path/to/win/pd/ --disable-PIC
irix :
------------------------------------------------------------------------------
diff --git a/src/configure.ac b/src/configure.ac
index 2e298a2..0d5d5d0 100644
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -23,9 +23,11 @@ AC_SUBST(INCLUDES)
AC_SUBST(SOURCES)
AC_SUBST(LIBNAME)
-AC_ARG_WITH(pdversion, [ --with-pdversion=<ver> enforce a certain pd-version (e.g. 0.37)])
-AC_ARG_WITH(version, [ --with-version=<ver> enforce a certain zexy-version (e.g. 2.0)])
-AC_ARG_WITH(extension, [ --with-extension=<ext> enforce a certain extension for the dynamic library (e.g. dll)])
+AC_ARG_WITH(pdversion,[ --with-pdversion=<ver> enforce a certain pd-version (e.g. 0.37)])
+AC_ARG_WITH(version, [ --with-version=<ver> enforce a certain zexy-version (e.g. 2.0)])
+AC_ARG_WITH(extension,[ --with-extension=<ext> enforce a certain extension for the dynamic library (e.g. dll)])
+AC_ARG_WITH(pdpath, [ --with-pd=</path/to/pd> where to look for pd-headers and and -libs])
+AC_ARG_ENABLE(PIC, [ --disable-PIC disable compilation with PIC-flag])
AC_ARG_ENABLE(lpt, [ --enable-lpt enable parallelport-support])
AC_ARG_ENABLE(icc, [ --enable-icc enable ICC-support])
if test `uname -s` = Darwin;
@@ -61,6 +63,15 @@ then
fi
fi
+if test "x$with_pd" != "x"; then
+ if test -d "${with_pd}/src"; then
+ INCLUDES="-I${with_pd}/src ${INCLUDES}"
+ fi
+ if test -d "${with_pd}/bin"; then
+ LIBS="-L${with_pd}/bin ${LIBS}"
+ fi
+fi
+
if test $includedir
then
for id in $includedir
@@ -125,7 +136,7 @@ else
echo "no"
fi
-
+if test "x$enable_PIC" != "xno"; then
AC_MSG_CHECKING("PIC")
cat > conftest.c << EOF
int main(){
@@ -139,7 +150,7 @@ then
else
echo "no"
fi
-
+fi
dnl if we don't have $LD set, we set it to $(CC)