diff options
| -rwxr-xr-x | configure | 30 | ||||
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | include/pdp_net.h | 1 |
3 files changed, 23 insertions, 18 deletions
@@ -2641,8 +2641,8 @@ else fi; - -PDP_CFLAGS="-DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch" +PWD=`pwd` +PDP_CFLAGS="-DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -I$(PWD)/../../pd/src" @@ -2680,7 +2680,6 @@ _ACEOF fi -PWD=`pwd` if test -f $prefix/pd/src/m_pd.h; then PD_CPPFLAGS="-I$prefix/pd/src" @@ -2688,6 +2687,9 @@ then elif test -f $prefix/src/pd/src/m_pd.h; then PD_CPPFLAGS="-I$prefix/src/pd/src" +elif test -f $PWD/../../pd/src/m_pd.h; +then + PD_CPPFLAGS="-I$PWD/../../pd/src" elif test -f $PWD/../pd/src/m_pd.h; then PD_CPPFLAGS="-I$PWD/../pd/src" @@ -2988,7 +2990,7 @@ fi if test $ARCH == Darwin then - PD_EXECUTABLE=$prefix/bin/pd + PD_EXECUTABLE=$PWD/../../pd/bin/pd LIBS="$LIBS -L/sw/lib" CPPFLAGS="$CPPFLAGS -I/sw/include" PDP_EXTRA_CPPFLAGS="-I/sw/include" @@ -3627,9 +3629,9 @@ fi if test $enable_sdl == yes then - echo "$as_me:$LINENO: checking for SDL_Init in -lSDL" >&5 -echo $ECHO_N "checking for SDL_Init in -lSDL... $ECHO_C" >&6 -if test "${ac_cv_lib_SDL_SDL_Init+set}" = set; then + echo "$as_me:$LINENO: checking for SDL_GL_GetAttribute in -lSDL" >&5 +echo $ECHO_N "checking for SDL_GL_GetAttribute in -lSDL... $ECHO_C" >&6 +if test "${ac_cv_lib_SDL_SDL_GL_GetAttribute+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@ -3648,11 +3650,11 @@ 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 SDL_Init (); +char SDL_GL_GetAttribute (); int main () { -SDL_Init (); +SDL_GL_GetAttribute (); ; return 0; } @@ -3669,19 +3671,19 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_SDL_SDL_Init=yes + ac_cv_lib_SDL_SDL_GL_GetAttribute=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_SDL_SDL_Init=no +ac_cv_lib_SDL_SDL_GL_GetAttribute=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_SDL_Init" >&5 -echo "${ECHO_T}$ac_cv_lib_SDL_SDL_Init" >&6 -if test $ac_cv_lib_SDL_SDL_Init = yes; then +echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_SDL_GL_GetAttribute" >&5 +echo "${ECHO_T}$ac_cv_lib_SDL_SDL_GL_GetAttribute" >&6 +if test $ac_cv_lib_SDL_SDL_GL_GetAttribute = yes; then PDP_OPTMOD="$PDP_OPTMOD pdp_sdl.o" LIBS="$LIBS -lSDL" diff --git a/configure.ac b/configure.ac index 39467a2..31aca5e 100644 --- a/configure.ac +++ b/configure.ac @@ -42,8 +42,8 @@ AC_ARG_ENABLE(debug, [ --enable-debug enable debugging support (no)], , enable_debug=no) - -PDP_CFLAGS="-DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch" +PWD=`pwd` +PDP_CFLAGS="-DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -I$(PWD)/../../pd/src" dnl -Werror -Wshadow @@ -75,7 +75,6 @@ fi dnl try to locate the pd header in case the setup is nonstandard dnl check in $prefix/pd/src then ../pd/src dnl if this fails we trust it is in the standard include path -PWD=`pwd` if test -f $prefix/pd/src/m_pd.h; then PD_CPPFLAGS="-I$prefix/pd/src" @@ -83,6 +82,9 @@ then elif test -f $prefix/src/pd/src/m_pd.h; then PD_CPPFLAGS="-I$prefix/src/pd/src" +elif test -f $PWD/../../pd/src/m_pd.h; +then + PD_CPPFLAGS="-I$PWD/../../pd/src" elif test -f $PWD/../pd/src/m_pd.h; then PD_CPPFLAGS="-I$PWD/../pd/src" @@ -125,7 +127,7 @@ dnl Darwin specific stuff: this is still pretty experimental dnl How to test if frameworks are present ???? if test $ARCH == Darwin then - PD_EXECUTABLE=$prefix/bin/pd + PD_EXECUTABLE=$PWD/../../pd/bin/pd LIBS="$LIBS -L/sw/lib" CPPFLAGS="$CPPFLAGS -I/sw/include" PDP_EXTRA_CPPFLAGS="-I/sw/include" diff --git a/include/pdp_net.h b/include/pdp_net.h index ddc3f7f..9e638c4 100644 --- a/include/pdp_net.h +++ b/include/pdp_net.h @@ -39,6 +39,7 @@ */ +#include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> |