Update of /cvsroot/pure-data/externals/OSCx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24275
Modified Files: Makefile.in configure configure.ac Log Message: made unified autoconf build, should work with MinGW also
Index: Makefile.in =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/Makefile.in,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile.in 4 Apr 2004 22:10:39 -0000 1.2 --- Makefile.in 5 Apr 2004 04:26:00 -0000 1.3 *************** *** 3,8 **** all: cd libOSC ; make - cd send+dump ; make cd src ; make
install: all --- 3,8 ---- all: cd libOSC ; make cd src ; make + cd send+dump ; make
install: all
Index: configure.ac =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/configure.ac,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** configure.ac 4 Apr 2004 22:10:40 -0000 1.2 --- configure.ac 5 Apr 2004 04:26:00 -0000 1.3 *************** *** 7,10 **** --- 7,13 ---- AC_CONFIG_HEADER([config.h])
+ # get system type + AC_CANONICAL_HOST + # Checks for programs. AC_PROG_CC *************** *** 25,34 **** echo ldflags "$LDFLAGS"
- dnl ------------------------------------------ - dnl ---- do some magic to gues the host opsys - dnl ---- taken from libvorbis configure.in - dnl ------------------------------------------ - AC_CANONICAL_HOST - # Checks for libraries. # FIXME: Replace `main' with a function in `-lc': --- 28,31 ---- *************** *** 39,43 **** # Checks for header files. AC_HEADER_STDC ! AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stdlib.h string.h strings.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h unistd.h])
# Checks for typedefs, structures, and compiler characteristics. --- 36,40 ---- # Checks for header files. AC_HEADER_STDC ! AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stdlib.h string.h strings.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h unistd.h sys/prctl.h])
# Checks for typedefs, structures, and compiler characteristics. *************** *** 61,66 **** dnl ------------------------------------------
! INCLUDES="-I../libOSC -I../../../pd/src" ! LDFLAGS="$LDFLAGS -L/usr/local/lib -ldl" if test -z "$GCC"; then case $host in --- 58,63 ---- dnl ------------------------------------------
! INCLUDES="-I../libOSC -I../../pd/src -I../../../pd/src -I." ! LIBOSC=libOSC.a if test -z "$GCC"; then case $host in *************** *** 74,117 **** sparc-sun-solaris*) CFLAGS="-xO4 -fast -w -fsimple -native -xcg92" ! ;; *) CFLAGS="-O" ! ;; esac else - case $host in *86-*-linux*) CFLAGS="$CFLAGS -DUNIX -Wall -Wimplicit -Wunused -Wmissing-prototypes -O2" ! LDFLAGS="$LDFLAGS -shared" ! dnl we could test for bad glibc here, but don't ! pd_suffix=pd_linux ! ;; powerpc-*-linux*) CFLAGS="$CFLAGS -DUNIX -Wall -Wimplicit -Wunused -Wmissing-prototypes -O1" ! LDFLAGS="$LDFLAGS -shared" ! pd_suffix=pd_linux ! ;; *-*-linux*) CFLAGS="$CFLAGS -DUNIX -Wall -Wimplicit -Wunused -Wmissing-prototypes -O1" ! LDFLAGS="$LDFLAGS -shared" ! INCLUDES="$INCLUDES" ! pd_suffix=pd_linux ! ;; sparc-sun-*) ! echo "YOU HAVE A SPARC STATION, not setting any flags, not supported yet" ! ;; *-*-darwin*) CFLAGS="$CPFLAGS -DUNIX -Wall -Wimplicit -Wunused -Wmissing-prototypes -O3 " ! # LDFLAGS="$LDFLAGS -bundle -bundle_loader ../../../pd/bin/pd -undefined suppress -flat_namespace" ! LDFLAGS="$LDFLAGS -bundle -bundle_loader ../../../pd/bin/pd -flat_namespace" ! pd_suffix=pd_darwin ! ;; *) ! dnl assume unix CFLAGS="$CFLAGS -DUNIX -Wall -Wimplicit -Wunused -Wmissing-prototypes -O1" ! LDFLAGS="$LDFLAGS -shared" ! pd_suffix=pd_linux ! ;; esac fi --- 71,120 ---- sparc-sun-solaris*) CFLAGS="-xO4 -fast -w -fsimple -native -xcg92" ! ;; *) CFLAGS="-O" ! ;; esac else case $host in *86-*-linux*) CFLAGS="$CFLAGS -DUNIX -Wall -Wimplicit -Wunused -Wmissing-prototypes -O2" ! LDFLAGS="-Wl,-export_dynamic -shared" ! dnl we could test for bad glibc here, but don't ! pd_suffix=pd_linux ! ;; powerpc-*-linux*) CFLAGS="$CFLAGS -DUNIX -Wall -Wimplicit -Wunused -Wmissing-prototypes -O1" ! LDFLAGS="-Wl,-export_dynamic -shared" ! pd_suffix=pd_linux ! ;; *-*-linux*) CFLAGS="$CFLAGS -DUNIX -Wall -Wimplicit -Wunused -Wmissing-prototypes -O1" ! LDFLAGS="-Wl,-export_dynamic -shared" ! INCLUDES="$INCLUDES" ! pd_suffix=pd_linux ! ;; sparc-sun-*) ! echo "YOU HAVE A SPARC STATION, not setting any flags, not supported yet" ! ;; ! *-*-cygwin*) ! CFLAGS="$CPFLAGS -mno-cygwin -Wall -Wimplicit -Wunused -Wmissing-prototypes -O3 " ! LDFLAGS="-Wl,-export_dynamic -shared" ! INCLUDES="$INCLUDES -I../../../pd/bin" ! LIBOSC=libOSC.lib ! pd_suffix=dll ! ;; *-*-darwin*) CFLAGS="$CPFLAGS -DUNIX -Wall -Wimplicit -Wunused -Wmissing-prototypes -O3 " ! # LDFLAGS=" -bundle -bundle_loader ../../../pd/bin/pd -undefined suppress -flat_namespace" ! LDFLAGS=" -bundle -bundle_loader ../../../pd/bin/pd -flat_namespace " ! pd_suffix=pd_darwin ! ;; *) ! dnl assume unix CFLAGS="$CFLAGS -DUNIX -Wall -Wimplicit -Wunused -Wmissing-prototypes -O1" ! LDFLAGS="-Wl,-export_dynamic -shared" ! pd_suffix=pd_linux ! ;; esac fi *************** *** 150,155 **** --- 153,160 ----
+ AC_SUBST(LIBOSC) AC_SUBST(pd_suffix) AC_SUBST(INCLUDES) + AC_SUBST(CFLAGS)
AC_CONFIG_FILES([src/Makefile
Index: configure =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/configure,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** configure 4 Apr 2004 22:10:40 -0000 1.2 --- configure 5 Apr 2004 04:26:00 -0000 1.3 *************** *** 311,315 **** #endif"
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT LN_S CPP build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LIBOBJS pd_suffix INCLUDES LTLIBOBJS' ac_subst_files=''
--- 311,315 ---- #endif"
! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT LN_S CPP EGREP LIBOBJS LIBOSC pd_suffix INCLUDES LTLIBOBJS' ac_subst_files=''
*************** *** 1280,1283 **** --- 1280,1364 ----
+ # get system type + ac_aux_dir= + for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do + if test -f $ac_dir/install-sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f $ac_dir/install.sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f $ac_dir/shtool; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi + done + if test -z "$ac_aux_dir"; then + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 + echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} + { (exit 1); exit 1; }; } + fi + ac_config_guess="$SHELL $ac_aux_dir/config.guess" + ac_config_sub="$SHELL $ac_aux_dir/config.sub" + ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. + + # Make sure we can run config.sub. + $ac_config_sub sun4 >/dev/null 2>&1 || + { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 + echo "$as_me: error: cannot run $ac_config_sub" >&2;} + { (exit 1); exit 1; }; } + + echo "$as_me:$LINENO: checking build system type" >&5 + echo $ECHO_N "checking build system type... $ECHO_C" >&6 + if test "${ac_cv_build+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_build_alias=$build_alias + test -z "$ac_cv_build_alias" && + ac_cv_build_alias=`$ac_config_guess` + test -z "$ac_cv_build_alias" && + { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 + echo "$as_me: error: cannot guess build type; you must specify one" >&2;} + { (exit 1); exit 1; }; } + ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || + { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 + echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} + { (exit 1); exit 1; }; } + + fi + echo "$as_me:$LINENO: result: $ac_cv_build" >&5 + echo "${ECHO_T}$ac_cv_build" >&6 + build=$ac_cv_build + build_cpu=`echo $ac_cv_build | sed 's/^([^-]*)-([^-]*)-(.*)$/\1/'` + build_vendor=`echo $ac_cv_build | sed 's/^([^-]*)-([^-]*)-(.*)$/\2/'` + build_os=`echo $ac_cv_build | sed 's/^([^-]*)-([^-]*)-(.*)$/\3/'` + + + echo "$as_me:$LINENO: checking host system type" >&5 + echo $ECHO_N "checking host system type... $ECHO_C" >&6 + if test "${ac_cv_host+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_cv_host_alias=$host_alias + test -z "$ac_cv_host_alias" && + ac_cv_host_alias=$ac_cv_build_alias + ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || + { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} + { (exit 1); exit 1; }; } + + fi + echo "$as_me:$LINENO: result: $ac_cv_host" >&5 + echo "${ECHO_T}$ac_cv_host" >&6 + host=$ac_cv_host + host_cpu=`echo $ac_cv_host | sed 's/^([^-]*)-([^-]*)-(.*)$/\1/'` + host_vendor=`echo $ac_cv_host | sed 's/^([^-]*)-([^-]*)-(.*)$/\2/'` + host_os=`echo $ac_cv_host | sed 's/^([^-]*)-([^-]*)-(.*)$/\3/'` + + + # Checks for programs. ac_ext=c *************** *** 2403,2486 **** echo ldflags "$LDFLAGS"
- ac_aux_dir= - for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - if test -f $ac_dir/install-sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f $ac_dir/install.sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f $ac_dir/shtool; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi - done - if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 - echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} - { (exit 1); exit 1; }; } - fi - ac_config_guess="$SHELL $ac_aux_dir/config.guess" - ac_config_sub="$SHELL $ac_aux_dir/config.sub" - ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. - - # Make sure we can run config.sub. - $ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 - echo "$as_me: error: cannot run $ac_config_sub" >&2;} - { (exit 1); exit 1; }; } - - echo "$as_me:$LINENO: checking build system type" >&5 - echo $ECHO_N "checking build system type... $ECHO_C" >&6 - if test "${ac_cv_build+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_cv_build_alias=$build_alias - test -z "$ac_cv_build_alias" && - ac_cv_build_alias=`$ac_config_guess` - test -z "$ac_cv_build_alias" && - { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 - echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } - ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 - echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} - { (exit 1); exit 1; }; } - - fi - echo "$as_me:$LINENO: result: $ac_cv_build" >&5 - echo "${ECHO_T}$ac_cv_build" >&6 - build=$ac_cv_build - build_cpu=`echo $ac_cv_build | sed 's/^([^-]*)-([^-]*)-(.*)$/\1/'` - build_vendor=`echo $ac_cv_build | sed 's/^([^-]*)-([^-]*)-(.*)$/\2/'` - build_os=`echo $ac_cv_build | sed 's/^([^-]*)-([^-]*)-(.*)$/\3/'` - - - echo "$as_me:$LINENO: checking host system type" >&5 - echo $ECHO_N "checking host system type... $ECHO_C" >&6 - if test "${ac_cv_host+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - ac_cv_host_alias=$host_alias - test -z "$ac_cv_host_alias" && - ac_cv_host_alias=$ac_cv_build_alias - ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 - echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} - { (exit 1); exit 1; }; } - - fi - echo "$as_me:$LINENO: result: $ac_cv_host" >&5 - echo "${ECHO_T}$ac_cv_host" >&6 - host=$ac_cv_host - host_cpu=`echo $ac_cv_host | sed 's/^([^-]*)-([^-]*)-(.*)$/\1/'` - host_vendor=`echo $ac_cv_host | sed 's/^([^-]*)-([^-]*)-(.*)$/\2/'` - host_os=`echo $ac_cv_host | sed 's/^([^-]*)-([^-]*)-(.*)$/\3/'` - - - # Checks for libraries. # FIXME: Replace `main' with a function in `-lc': --- 2484,2487 ---- *************** *** 2857,2861 ****
! for ac_header in arpa/inet.h fcntl.h netdb.h netinet/in.h stdlib.h string.h strings.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h unistd.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --- 2858,2863 ----
! ! for ac_header in arpa/inet.h fcntl.h netdb.h netinet/in.h stdlib.h string.h strings.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h unistd.h sys/prctl.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` *************** *** 4113,4118 ****
! INCLUDES="-I../libOSC -I../../../pd/src" ! LDFLAGS="$LDFLAGS -L/usr/local/lib -ldl" if test -z "$GCC"; then case $host in --- 4115,4120 ----
! INCLUDES="-I../libOSC -I../../pd/src -I../../../pd/src -I." ! LIBOSC=libOSC.a if test -z "$GCC"; then case $host in *************** *** 4124,4165 **** sparc-sun-solaris*) CFLAGS="-xO4 -fast -w -fsimple -native -xcg92" ! ;; *) CFLAGS="-O" ! ;; esac else - case $host in *86-*-linux*) CFLAGS="$CFLAGS -DUNIX -Wall -Wimplicit -Wunused -Wmissing-prototypes -O2" ! LDFLAGS="$LDFLAGS -shared" ! pd_suffix=pd_linux ! ;; powerpc-*-linux*) CFLAGS="$CFLAGS -DUNIX -Wall -Wimplicit -Wunused -Wmissing-prototypes -O1" ! LDFLAGS="$LDFLAGS -shared" ! pd_suffix=pd_linux ! ;; *-*-linux*) CFLAGS="$CFLAGS -DUNIX -Wall -Wimplicit -Wunused -Wmissing-prototypes -O1" ! LDFLAGS="$LDFLAGS -shared" ! INCLUDES="$INCLUDES" ! pd_suffix=pd_linux ! ;; sparc-sun-*) ! echo "YOU HAVE A SPARC STATION, not setting any flags, not supported yet" ! ;; *-*-darwin*) CFLAGS="$CPFLAGS -DUNIX -Wall -Wimplicit -Wunused -Wmissing-prototypes -O3 " ! # LDFLAGS="$LDFLAGS -bundle -bundle_loader ../../../pd/bin/pd -undefined suppress -flat_namespace" ! LDFLAGS="$LDFLAGS -bundle -bundle_loader ../../../pd/bin/pd -flat_namespace" ! pd_suffix=pd_darwin ! ;; *) ! CFLAGS="$CFLAGS -DUNIX -Wall -Wimplicit -Wunused -Wmissing-prototypes -O1" ! LDFLAGS="$LDFLAGS -shared" ! pd_suffix=pd_linux ! ;; esac fi --- 4126,4173 ---- sparc-sun-solaris*) CFLAGS="-xO4 -fast -w -fsimple -native -xcg92" ! ;; *) CFLAGS="-O" ! ;; esac else case $host in *86-*-linux*) CFLAGS="$CFLAGS -DUNIX -Wall -Wimplicit -Wunused -Wmissing-prototypes -O2" ! LDFLAGS="-Wl,-export_dynamic -shared" ! pd_suffix=pd_linux ! ;; powerpc-*-linux*) CFLAGS="$CFLAGS -DUNIX -Wall -Wimplicit -Wunused -Wmissing-prototypes -O1" ! LDFLAGS="-Wl,-export_dynamic -shared" ! pd_suffix=pd_linux ! ;; *-*-linux*) CFLAGS="$CFLAGS -DUNIX -Wall -Wimplicit -Wunused -Wmissing-prototypes -O1" ! LDFLAGS="-Wl,-export_dynamic -shared" ! INCLUDES="$INCLUDES" ! pd_suffix=pd_linux ! ;; sparc-sun-*) ! echo "YOU HAVE A SPARC STATION, not setting any flags, not supported yet" ! ;; ! *-*-cygwin*) ! CFLAGS="$CPFLAGS -mno-cygwin -Wall -Wimplicit -Wunused -Wmissing-prototypes -O3 " ! LDFLAGS="-Wl,-export_dynamic -shared" ! INCLUDES="$INCLUDES -I../../../pd/bin" ! LIBOSC=libOSC.lib ! pd_suffix=dll ! ;; *-*-darwin*) CFLAGS="$CPFLAGS -DUNIX -Wall -Wimplicit -Wunused -Wmissing-prototypes -O3 " ! # LDFLAGS=" -bundle -bundle_loader ../../../pd/bin/pd -undefined suppress -flat_namespace" ! LDFLAGS=" -bundle -bundle_loader ../../../pd/bin/pd -flat_namespace " ! pd_suffix=pd_darwin ! ;; *) ! CFLAGS="$CFLAGS -DUNIX -Wall -Wimplicit -Wunused -Wmissing-prototypes -O1" ! LDFLAGS="-Wl,-export_dynamic -shared" ! pd_suffix=pd_linux ! ;; esac fi *************** *** 4332,4335 **** --- 4340,4345 ----
+ + ac_config_files="$ac_config_files src/Makefile libOSC/Makefile send+dump/Makefile Makefile"
*************** *** 4947,4950 **** --- 4957,4968 ---- s,@ECHO_T@,$ECHO_T,;t t s,@LIBS@,$LIBS,;t t + s,@build@,$build,;t t + s,@build_cpu@,$build_cpu,;t t + s,@build_vendor@,$build_vendor,;t t + s,@build_os@,$build_os,;t t + s,@host@,$host,;t t + s,@host_cpu@,$host_cpu,;t t + s,@host_vendor@,$host_vendor,;t t + s,@host_os@,$host_os,;t t s,@CC@,$CC,;t t s,@CFLAGS@,$CFLAGS,;t t *************** *** 4956,4969 **** s,@LN_S@,$LN_S,;t t s,@CPP@,$CPP,;t t - s,@build@,$build,;t t - s,@build_cpu@,$build_cpu,;t t - s,@build_vendor@,$build_vendor,;t t - s,@build_os@,$build_os,;t t - s,@host@,$host,;t t - s,@host_cpu@,$host_cpu,;t t - s,@host_vendor@,$host_vendor,;t t - s,@host_os@,$host_os,;t t s,@EGREP@,$EGREP,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@pd_suffix@,$pd_suffix,;t t s,@INCLUDES@,$INCLUDES,;t t --- 4974,4980 ---- s,@LN_S@,$LN_S,;t t s,@CPP@,$CPP,;t t s,@EGREP@,$EGREP,;t t s,@LIBOBJS@,$LIBOBJS,;t t + s,@LIBOSC@,$LIBOSC,;t t s,@pd_suffix@,$pd_suffix,;t t s,@INCLUDES@,$INCLUDES,;t t