Skip to content
Permalink
Browse files

*** empty log message ***

  • Loading branch information
slouken committed Dec 18, 2001
1 parent 12ed647 commit 128ce320fdb3567046acfaa9ae1f1dffe4296866
Showing with 11 additions and 9 deletions.
  1. +9 −7 configure.in
  2. +2 −2 sdl-config.in
@@ -2174,14 +2174,15 @@ AM_CONDITIONAL([ENABLE_STATIC], [test "$enable_static" = yes])
if test $ARCH = linux -o $ARCH = freebsd -o $ARCH = bsdi; then
SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib"
fi

if test $ARCH = solaris; then
SDL_RLD_FLAGS="-R\${exec_prefix}/lib"
fi

if test $ARCH = openbsd; then
SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib $SYSTEM_LIBS"
if test $ARCH = openbsd -o $ARCH = bsdi; then
SHARED_SYSTEM_LIBS="$SYSTEM_LIBS"
else
SHARED_SYSTEM_LIBS=""
fi
STATIC_SYSTEM_LIBS="$SYSTEM_LIBS"

dnl Output the video drivers we use
if test x$enable_video = xtrue; then
@@ -2199,15 +2200,16 @@ AC_SUBST(CDROM_SUBDIRS)
AC_SUBST(CDROM_DRIVERS)
AC_SUBST(SDL_EXTRADIRS)
AC_SUBST(SDL_EXTRALIBS)
AC_SUBST(SYSTEM_LIBS)

dnl Expand the cflags and libraries needed by apps using SDL
AC_SUBST(SDL_CFLAGS)
AC_SUBST(SDL_LIBS)
AC_SUBST(SDL_RLD_FLAGS)

dnl Expand the libraries needed for static linking
AC_SUBST(SYSTEM_LIBS)
dnl Expand the libraries needed for static and dynamic linking
AC_SUBST(STATIC_SYSTEM_LIBS)
AC_SUBST(SHARED_SYSTEM_LIBS)

dnl Expand the include directories for building SDL
CFLAGS="$CFLAGS -I\$(top_srcdir)/include"
CFLAGS="$CFLAGS -I\$(top_srcdir)/include/SDL"
@@ -49,12 +49,12 @@ while test $# -gt 0; do
;;
@ENABLE_SHARED_TRUE@ --libs)
@ENABLE_SHARED_TRUE@ libdirs="-L@libdir@ @SDL_RLD_FLAGS@"
@ENABLE_SHARED_TRUE@ echo $libdirs @SDL_LIBS@
@ENABLE_SHARED_TRUE@ echo $libdirs @SDL_LIBS@ @SHARED_SYSTEM_LIBS@
@ENABLE_SHARED_TRUE@ ;;
@ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs)
@ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs)
@ENABLE_STATIC_TRUE@ libdirs="-L@libdir@ @SDL_RLD_FLAGS@"
@ENABLE_STATIC_TRUE@ echo $libdirs @SDL_LIBS@ @SYSTEM_LIBS@
@ENABLE_STATIC_TRUE@ echo $libdirs @SDL_LIBS@ @STATIC_SYSTEM_LIBS@
@ENABLE_STATIC_TRUE@ ;;
*)
echo "${usage}" 1>&2

0 comments on commit 128ce32

Please sign in to comment.