[PD-cvs] externals/august/readanysf~ configure, 1.2, 1.3 configure.ac, 1.2, 1.3
Georg Holzmann
grholzi at users.sourceforge.net
Thu Mar 23 20:51:27 CET 2006
Update of /cvsroot/pure-data/externals/august/readanysf~
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15185
Modified Files:
configure configure.ac
Log Message:
bugfix for new flext version
Index: configure.ac
===================================================================
RCS file: /cvsroot/pure-data/externals/august/readanysf~/configure.ac,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** configure.ac 27 Feb 2006 11:45:45 -0000 1.2
--- configure.ac 23 Mar 2006 19:51:25 -0000 1.3
***************
*** 5,8 ****
--- 5,9 ----
+ dnl AC_LANG_PUSH([C++])
dnl ----------------------------------
***************
*** 33,43 ****
dnl AC_PROG_RANLIB
- echo
- echo "$CPPFLAGS"
- echo "$CXXFLAGS"
- echo "$CFLAGS"
- echo "$LDFLAGS"
- echo
-
have_vorbis=no
have_mad=no
--- 34,37 ----
***************
*** 45,49 ****
flext_sys=2
! flext_dir=/usr/local/lib/pd/flext
flext_shared=yes
--- 39,43 ----
flext_sys=2
! flext_dir=/usr/local/include/flext
flext_shared=yes
***************
*** 51,55 ****
-
dnl ------------------------------------------
dnl ---- do some magic to gues the host opsys
--- 45,48 ----
***************
*** 85,94 ****
;;
powerpc-*-linux*)
! CPPFLAGS="$CPPFLAGS -DUNIX -Wno-deprecated -Wall -Wimplicit -Wunused -Wmissing-prototypes -O1"
LDFLAGS="$LDFLAGS -shared"
pd_suffix=pd_linux
;;
*-*-linux*)
! CPPFLAGS="$CPPFLAGS -DUNIX -Wno-deprecated -Wall -Wimplicit -Wunused -Wmissing-prototypes -O1"
LDFLAGS="$LDFLAGS -shared"
pd_suffix=pd_linux
--- 78,87 ----
;;
powerpc-*-linux*)
! CPPFLAGS="$CPPFLAGS -DUNIX -Wno-deprecated -Wall -Wimplicit -Wunused -Wmissing-prototypes -O1 "
LDFLAGS="$LDFLAGS -shared"
pd_suffix=pd_linux
;;
*-*-linux*)
! CPPFLAGS="$CPPFLAGS -DUNIX -Wno-deprecated -Wall -Wimplicit -Wunused -Wmissing-prototypes -O1 -fPIC"
LDFLAGS="$LDFLAGS -shared"
pd_suffix=pd_linux
***************
*** 114,122 ****
dnl -dylib -dynamic -flat_namespace -undefined suppress
- echo
echo "Using cppflags= $CPPFLAGS"
echo "Using ldflags= $LDFLAGS"
- echo
-
--- 107,112 ----
***************
*** 168,172 ****
dnl ------------------------------------------
AC_ARG_WITH(flext_dir,
! [ --with-flext-dir=path flext headers path (default=/usr/local/lib/pd/flext) ],
[
flext_dir=$withval
--- 158,162 ----
dnl ------------------------------------------
AC_ARG_WITH(flext_dir,
! [ --with-flext-dir=path flext headers path (default=/usr/local/include/flext) ],
[
flext_dir=$withval
***************
*** 215,219 ****
echo
echo "found libsamplerate, but didn't find header. make sure samplerate.h is somewhere"
! echo "that can be found and try configure again."
echo
exit
--- 205,209 ----
echo
echo "found libsamplerate, but didn't find header. make sure samplerate.h is somewhere"
! echo "that can be found and try configure again. on debian, do: apt-get install libsamplerate0-dev"
echo
exit
***************
*** 230,234 ****
SRC_LIBS=""
echo "you need libsamplerate. download it here <http://www.mega-nerd.com/SRC/>"
! echo
exit
])
--- 220,224 ----
SRC_LIBS=""
echo "you need libsamplerate. download it here <http://www.mega-nerd.com/SRC/>"
! echo "on debian, do: apt-get install libsamplerate0-dev"
exit
])
***************
*** 299,302 ****
--- 289,293 ----
+ echo "checking for old flext libraries"
dnl ------------------------------------------
***************
*** 307,311 ****
if test "$flext_shared" = "yes"; then
FLEXT_LIBS="-lflext"
! FLEXT_CFLAGS="-DFLEXT_SYS=$flext_sys -DFLEXT_THREADS -DFLEXT_SHARED -DFLEXT_USE_CMEM"
else
echo
--- 298,302 ----
if test "$flext_shared" = "yes"; then
FLEXT_LIBS="-lflext"
! FLEXT_CFLAGS="-DFLEXT_SYS=$flext_sys -DFLEXT_THREADS -DFLEXT_SHARED -DFLEXT_NOGLOBALNEW"
else
echo
***************
*** 313,341 ****
echo "try configure --enable-flext-shared"
echo
! FLEXT_CFLAGS="-DFLEXT_SYS=$flext_sys -DFLEXT_THREADS -DFLEXT_USE_CMEM"
FLEXT_LIBS=""
fi
else
! if test "$flext_shared" = "yes"; then
! echo
! echo "you want to link to FLEXT dynamicaly, a very good idea, but..."
! echo "...configure couldn't find the FLEXT lib. Taking your word for it."
! echo "This seems to be normal on linux. Don't know why it happens."
! echo "just make sure you have the libflext.so in one of the paths listed"
! echo "under /etc/ld.so.conf (for linux). and, as root do ldconfig"
! echo
! FLEXT_LIBS="-lflext"
! FLEXT_CFLAGS="-DFLEXT_SYS=$flext_sys -DFLEXT_THREADS -DFLEXT_SHARED -DFLEXT_USE_CMEM"
else
echo
! echo "FLEXT is now setup to link statically. not the best idea, but it works"
echo
- FLEXT_CFLAGS="-DFLEXT_SYS=$flext_sys -DFLEXT_THREADS -DFLEXT_USE_CMEM"
- FLEXT_LIBS="$flext_dir/libflext_t.a"
fi
fi
!
!
--- 304,332 ----
echo "try configure --enable-flext-shared"
echo
! FLEXT_CFLAGS="-DFLEXT_SYS=$flext_sys -DFLEXT_THREADS -DFLEXT_NOGLOBALNEW"
FLEXT_LIBS=""
fi
else
! AC_CHECK_LIB(flext-pd, AddOutSignal, [have_flext_pd=yes ], [have_flext_pd=no])
! if test "$have_flext_pd" = "yes"; then
! echo "setting up for newer flext-pd"
! FLEXT_LIBS="-lflext-pd"
! if test "$flext_shared" = "yes"; then
! echo "setting up flext-pd as a shared lib."
! FLEXT_CFLAGS="-DFLEXT_SYS=$flext_sys -DFLEXT_THREADS -DFLEXT_SHARED -DFLEXT_USE_CMEM -I$flext_dir"
! else
! FLEXT_CFLAGS="-DFLEXT_SYS=$flext_sys -DFLEXT_THREADS -DFLEXT_USE_CMEM -I$flext_dir"
! fi
else
echo
! echo "no flext or flext-pd libraries found! build will probably fail."
echo
fi
fi
! echo
! echo "If $flext_dir does not have the flext header files in it."
! echo "do: ./configure --with-flext-dir=/path/to/flext/headers"
! echo
***************
*** 374,380 ****
if test "$flext_sys" = "1"; then
! echo " + FLEXT support for Max/MSP @ $flext_dir"
elif test "$flext_sys" = "2"; then
! echo " + FLEXT support for PureData @ $flext_dir"
fi
--- 365,371 ----
if test "$flext_sys" = "1"; then
! echo " + FLEXT support for Max/MSP "
elif test "$flext_sys" = "2"; then
! echo " + FLEXT support for PureData "
fi
Index: configure
===================================================================
RCS file: /cvsroot/pure-data/externals/august/readanysf~/configure,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** configure 27 Feb 2006 11:45:45 -0000 1.2
--- configure 23 Mar 2006 19:51:24 -0000 1.3
***************
*** 870,874 ****
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-pd-dir=path pd header path (default=/usr/local/include)
! --with-flext-dir=path flext headers path (default=/usr/local/lib/pd/flext)
--with-flext-sys=<N> 1 for Max/Msp, 2 for PD (default=2)
--- 870,874 ----
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-pd-dir=path pd header path (default=/usr/local/include)
! --with-flext-dir=path flext headers path (default=/usr/local/include/flext)
--with-flext-sys=<N> 1 for Max/Msp, 2 for PD (default=2)
***************
*** 3529,3539 ****
- echo
- echo "$CPPFLAGS"
- echo "$CXXFLAGS"
- echo "$CFLAGS"
- echo "$LDFLAGS"
- echo
-
have_vorbis=no
have_mad=no
--- 3529,3532 ----
***************
*** 3541,3545 ****
flext_sys=2
! flext_dir=/usr/local/lib/pd/flext
flext_shared=yes
--- 3534,3538 ----
flext_sys=2
! flext_dir=/usr/local/include/flext
flext_shared=yes
***************
*** 3547,3551 ****
-
# Make sure we can run config.sub.
$ac_config_sub sun4 >/dev/null 2>&1 ||
--- 3540,3543 ----
***************
*** 3627,3636 ****
;;
powerpc-*-linux*)
! CPPFLAGS="$CPPFLAGS -DUNIX -Wno-deprecated -Wall -Wimplicit -Wunused -Wmissing-prototypes -O1"
LDFLAGS="$LDFLAGS -shared"
pd_suffix=pd_linux
;;
*-*-linux*)
! CPPFLAGS="$CPPFLAGS -DUNIX -Wno-deprecated -Wall -Wimplicit -Wunused -Wmissing-prototypes -O1"
LDFLAGS="$LDFLAGS -shared"
pd_suffix=pd_linux
--- 3619,3628 ----
;;
powerpc-*-linux*)
! CPPFLAGS="$CPPFLAGS -DUNIX -Wno-deprecated -Wall -Wimplicit -Wunused -Wmissing-prototypes -O1 "
LDFLAGS="$LDFLAGS -shared"
pd_suffix=pd_linux
;;
*-*-linux*)
! CPPFLAGS="$CPPFLAGS -DUNIX -Wno-deprecated -Wall -Wimplicit -Wunused -Wmissing-prototypes -O1 -fPIC"
LDFLAGS="$LDFLAGS -shared"
pd_suffix=pd_linux
***************
*** 3654,3662 ****
- echo
echo "Using cppflags= $CPPFLAGS"
echo "Using ldflags= $LDFLAGS"
- echo
-
--- 3646,3651 ----
***************
*** 4407,4411 ****
echo
echo "found libsamplerate, but didn't find header. make sure samplerate.h is somewhere"
! echo "that can be found and try configure again."
echo
exit
--- 4396,4400 ----
echo
echo "found libsamplerate, but didn't find header. make sure samplerate.h is somewhere"
! echo "that can be found and try configure again. on debian, do: apt-get install libsamplerate0-dev"
echo
exit
***************
*** 4566,4570 ****
SRC_LIBS=""
echo "you need libsamplerate. download it here <http://www.mega-nerd.com/SRC/>"
! echo
exit
--- 4555,4559 ----
SRC_LIBS=""
echo "you need libsamplerate. download it here <http://www.mega-nerd.com/SRC/>"
! echo "on debian, do: apt-get install libsamplerate0-dev"
exit
***************
*** 5112,5115 ****
--- 5101,5105 ----
+ echo "checking for old flext libraries"
echo "$as_me:$LINENO: checking for AddOutSignal in -lflext" >&5
***************
*** 5185,5189 ****
if test "$flext_shared" = "yes"; then
FLEXT_LIBS="-lflext"
! FLEXT_CFLAGS="-DFLEXT_SYS=$flext_sys -DFLEXT_THREADS -DFLEXT_SHARED -DFLEXT_USE_CMEM"
else
echo
--- 5175,5179 ----
if test "$flext_shared" = "yes"; then
FLEXT_LIBS="-lflext"
! FLEXT_CFLAGS="-DFLEXT_SYS=$flext_sys -DFLEXT_THREADS -DFLEXT_SHARED -DFLEXT_NOGLOBALNEW"
else
echo
***************
*** 5191,5219 ****
echo "try configure --enable-flext-shared"
echo
! FLEXT_CFLAGS="-DFLEXT_SYS=$flext_sys -DFLEXT_THREADS -DFLEXT_USE_CMEM"
FLEXT_LIBS=""
fi
else
! if test "$flext_shared" = "yes"; then
! echo
! echo "you want to link to FLEXT dynamicaly, a very good idea, but..."
! echo "...configure couldn't find the FLEXT lib. Taking your word for it."
! echo "This seems to be normal on linux. Don't know why it happens."
! echo "just make sure you have the libflext.so in one of the paths listed"
! echo "under /etc/ld.so.conf (for linux). and, as root do ldconfig"
! echo
! FLEXT_LIBS="-lflext"
! FLEXT_CFLAGS="-DFLEXT_SYS=$flext_sys -DFLEXT_THREADS -DFLEXT_SHARED -DFLEXT_USE_CMEM"
else
echo
! echo "FLEXT is now setup to link statically. not the best idea, but it works"
echo
- FLEXT_CFLAGS="-DFLEXT_SYS=$flext_sys -DFLEXT_THREADS -DFLEXT_USE_CMEM"
- FLEXT_LIBS="$flext_dir/libflext_t.a"
fi
fi
!
!
--- 5181,5277 ----
echo "try configure --enable-flext-shared"
echo
! FLEXT_CFLAGS="-DFLEXT_SYS=$flext_sys -DFLEXT_THREADS -DFLEXT_NOGLOBALNEW"
FLEXT_LIBS=""
fi
else
! echo "$as_me:$LINENO: checking for AddOutSignal in -lflext-pd" >&5
! echo $ECHO_N "checking for AddOutSignal in -lflext-pd... $ECHO_C" >&6
! if test "${ac_cv_lib_flext_pd_AddOutSignal+set}" = set; then
! echo $ECHO_N "(cached) $ECHO_C" >&6
! else
! ac_check_lib_save_LIBS=$LIBS
! LIBS="-lflext-pd $LIBS"
! cat >conftest.$ac_ext <<_ACEOF
! /* confdefs.h. */
! _ACEOF
! cat confdefs.h >>conftest.$ac_ext
! cat >>conftest.$ac_ext <<_ACEOF
! /* end confdefs.h. */
!
! /* Override any gcc2 internal prototype to avoid an error. */
! #ifdef __cplusplus
! extern "C"
! #endif
! /* We use char because int might match the return type of a gcc2
! builtin and then its argument prototype would still apply. */
! char AddOutSignal ();
! int
! main ()
! {
! AddOutSignal ();
! ;
! return 0;
! }
! _ACEOF
! rm -f conftest.$ac_objext conftest$ac_exeext
! if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
! (eval $ac_link) 2>conftest.er1
! ac_status=$?
! grep -v '^ *+' conftest.er1 >conftest.err
! rm -f conftest.er1
! cat conftest.err >&5
! echo "$as_me:$LINENO: \$? = $ac_status" >&5
! (exit $ac_status); } &&
! { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
! (eval $ac_try) 2>&5
! ac_status=$?
! echo "$as_me:$LINENO: \$? = $ac_status" >&5
! (exit $ac_status); }; } &&
! { ac_try='test -s conftest$ac_exeext'
! { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
! (eval $ac_try) 2>&5
! ac_status=$?
! echo "$as_me:$LINENO: \$? = $ac_status" >&5
! (exit $ac_status); }; }; then
! ac_cv_lib_flext_pd_AddOutSignal=yes
! else
! echo "$as_me: failed program was:" >&5
! sed 's/^/| /' conftest.$ac_ext >&5
!
! ac_cv_lib_flext_pd_AddOutSignal=no
! fi
! rm -f conftest.err conftest.$ac_objext \
! conftest$ac_exeext conftest.$ac_ext
! LIBS=$ac_check_lib_save_LIBS
! fi
! echo "$as_me:$LINENO: result: $ac_cv_lib_flext_pd_AddOutSignal" >&5
! echo "${ECHO_T}$ac_cv_lib_flext_pd_AddOutSignal" >&6
! if test $ac_cv_lib_flext_pd_AddOutSignal = yes; then
! have_flext_pd=yes
! else
! have_flext_pd=no
! fi
!
! if test "$have_flext_pd" = "yes"; then
! echo "setting up for newer flext-pd"
! FLEXT_LIBS="-lflext-pd"
! if test "$flext_shared" = "yes"; then
! echo "setting up flext-pd as a shared lib."
! FLEXT_CFLAGS="-DFLEXT_SYS=$flext_sys -DFLEXT_THREADS -DFLEXT_SHARED -DFLEXT_USE_CMEM -I$flext_dir"
! else
! FLEXT_CFLAGS="-DFLEXT_SYS=$flext_sys -DFLEXT_THREADS -DFLEXT_USE_CMEM -I$flext_dir"
! fi
else
echo
! echo "no flext or flext-pd libraries found! build will probably fail."
echo
fi
fi
! echo
! echo "If $flext_dir does not have the flext header files in it."
! echo "do: ./configure --with-flext-dir=/path/to/flext/headers"
! echo
***************
*** 7196,7202 ****
if test "$flext_sys" = "1"; then
! echo " + FLEXT support for Max/MSP @ $flext_dir"
elif test "$flext_sys" = "2"; then
! echo " + FLEXT support for PureData @ $flext_dir"
fi
--- 7254,7260 ----
if test "$flext_sys" = "1"; then
! echo " + FLEXT support for Max/MSP "
elif test "$flext_sys" = "2"; then
! echo " + FLEXT support for PureData "
fi
More information about the Pd-cvs
mailing list