[PD-cvs] externals/pdp configure,1.3,1.4 configure.ac,1.4,1.5

[Hans-Christoph Steiner]

Update of /cvsroot/pure-data/externals/pdp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23887

Modified Files:
	configure configure.ac 
Log Message:
added a couple tweaks to build with the standard dev layout, and on Mac OS X

Index: configure.ac
===================================================================
RCS file: /cvsroot/pure-data/externals/pdp/configure.ac,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** configure.ac	16 Dec 2005 00:51:02 -0000	1.4
--- configure.ac	16 Dec 2005 02:55:14 -0000	1.5
***************
*** 43,48 ****
  
  
! 
! PDP_CFLAGS="-DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch"
  dnl -Werror -Wshadow
  
--- 43,48 ----
  
  
! PWD=`pwd`
! PDP_CFLAGS="-DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -I$(PWD)/../../pd/src"
  dnl -Werror -Wshadow
  
***************
*** 76,80 ****
  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
--- 76,79 ----
***************
*** 84,87 ****
--- 83,89 ----
  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
***************
*** 126,130 ****
  if test $ARCH == Darwin
  then
! 	PD_EXECUTABLE=$prefix/bin/pd
  	LIBS="$LIBS -L/sw/lib"
  	CPPFLAGS="$CPPFLAGS -I/sw/include"
--- 128,132 ----
  if test $ARCH == Darwin
  then
! 	PD_EXECUTABLE=$PWD/../../pd/bin/pd
  	LIBS="$LIBS -L/sw/lib"
  	CPPFLAGS="$CPPFLAGS -I/sw/include"

Index: configure
===================================================================
RCS file: /cvsroot/pure-data/externals/pdp/configure,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** configure	16 Dec 2005 00:51:02 -0000	1.3
--- configure	16 Dec 2005 02:55:14 -0000	1.4
***************
*** 2642,2647 ****
  
  
! 
! PDP_CFLAGS="-DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch"
  
  
--- 2642,2647 ----
  
  
! PWD=`pwd`
! PDP_CFLAGS="-DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -I$(PWD)/../../pd/src"
  
  
***************
*** 2681,2685 ****
  
  
- PWD=`pwd`
  if test -f $prefix/pd/src/m_pd.h;
  then
--- 2681,2684 ----
***************
*** 2689,2692 ****
--- 2688,2694 ----
  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
***************
*** 2989,2993 ****
  if test $ARCH == Darwin
  then
! 	PD_EXECUTABLE=$prefix/bin/pd
  	LIBS="$LIBS -L/sw/lib"
  	CPPFLAGS="$CPPFLAGS -I/sw/include"
--- 2991,2995 ----
  if test $ARCH == Darwin
  then
! 	PD_EXECUTABLE=$PWD/../../pd/bin/pd
  	LIBS="$LIBS -L/sw/lib"
  	CPPFLAGS="$CPPFLAGS -I/sw/include"
***************
*** 3628,3634 ****
  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 $ECHO_N "(cached) $ECHO_C" >&6
  else
--- 3630,3636 ----
  if test $enable_sdl == yes
  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
***************
*** 3649,3657 ****
  /* 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 ();
  int
  main ()
  {
! SDL_Init ();
    ;
    return 0;
--- 3651,3659 ----
  /* We use char because int might match the return type of a gcc2
     builtin and then its argument prototype would still apply.  */
! char SDL_GL_GetAttribute ();
  int
  main ()
  {
! SDL_GL_GetAttribute ();
    ;
    return 0;
***************
*** 3670,3686 ****
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   ac_cv_lib_SDL_SDL_Init=yes
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
! ac_cv_lib_SDL_SDL_Init=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
    PDP_OPTMOD="$PDP_OPTMOD pdp_sdl.o"
  		LIBS="$LIBS -lSDL"
--- 3672,3688 ----
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
!   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_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_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"