diff options
| author | IOhannes m zmölnig <zmoelnig@users.sourceforge.net> | 2006-11-03 08:42:21 +0000 |
|---|---|---|
| committer | IOhannes m zmölnig <zmoelnig@users.sourceforge.net> | 2006-11-03 08:42:21 +0000 |
| commit | 1d031e4e72cfd43eee1bebd1c27e2ce29d21da1b (patch) | |
| tree | 67fb540ac0bae73d52b83c686cbaa36a30c77369 /src | |
| parent | e50b7f69cca0265f673b9fbeeda4758cd9cab101 (diff) | |
...
svn path=/trunk/externals/zexy/; revision=6218
Diffstat (limited to 'src')
| -rw-r--r-- | src/Make.config.in | 1 | ||||
| -rw-r--r-- | src/Makefile | 9 | ||||
| -rw-r--r-- | src/configure.ac | 7 |
3 files changed, 14 insertions, 3 deletions
diff --git a/src/Make.config.in b/src/Make.config.in index f698357..bba967f 100644 --- a/src/Make.config.in +++ b/src/Make.config.in @@ -29,5 +29,6 @@ TARNAME = $(LIBNAME)-@LIBRARY_VERSION@.tgz Z_CFLAGS = $(IFLAGS) $(DEFS) $(BUILDLIBRARY) -DPD $(WFLAGS) @CFLAGS@ $(CFLAGS) MAKEDEP_FLAGS = @MAKEDEP_FLAGS@ +CONFIGUREFLAGS = @CONFIGUREFLAGS@ LIBS = @LIBS@ diff --git a/src/Makefile b/src/Makefile index cda0443..2d4d7d2 100644 --- a/src/Makefile +++ b/src/Makefile @@ -15,15 +15,18 @@ OBJECTSOURCES=$(sort $(filter-out $(HELPERSOURCES), $(filter %.c, $(wildcard *.c SOURCES=$(OBJECTSOURCES) $(HELPERSOURCES) zexyconf.h: zexyconf.h.in configure - ./configure + ./configure $(CONFIGUREFLAGS) -configure: configure.ac +configure: configure.ac aclocal.m4 autoconf +aclocal.m4: acinclude.m4 + aclocal + -include $(SOURCES:.c=.d) Make.config: Make.config.in configure - ./configure + ./configure $(CONFIGUREFLAGS) z_zexy.c z_zexy.h: ./makesource.sh diff --git a/src/configure.ac b/src/configure.ac index 3696e1d..16ae801 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -23,6 +23,13 @@ AC_SUBST(PDLIBDIR) AC_SUBST(INCLUDES) AC_SUBST(SOURCES) AC_SUBST(LIBNAME) +AC_SUBST(CONFIGUREFLAGS) + +## store the flags passed to us +## is there no way to get the flags without quotes? +#CONFIGUREFLAGS=${ac_configure_args} +## and is this solution portable? time will show.... +CONFIGUREFLAGS=$(echo ${ac_configure_args} | sed "s/'//g") 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)]) |