aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorHans-Christoph Steiner <eighthave@users.sourceforge.net>2005-12-16 02:55:15 +0000
committerHans-Christoph Steiner <eighthave@users.sourceforge.net>2005-12-16 02:55:15 +0000
commit1c28f203a96d6c8305a431879ab676676d39d045 (patch)
tree09d2ab0c342d33d9a34b367a0d80f6581a43e27e /configure
parentb694c274836ac8b04d644711ac324eac2e9ab83e (diff)
added a couple tweaks to build with the standard dev layout, and on Mac OS X
svn path=/trunk/externals/pdp/; revision=4233
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure30
1 files changed, 16 insertions, 14 deletions
diff --git a/configure b/configure
index be2296b..52a1fda 100755
--- a/configure
+++ b/configure
@@ -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"