*** empty log message ***
authorSam Lantinga <slouken@libsdl.org>
Tue, 18 Dec 2001 00:18:49 +0000
changeset 2579ac9ab945955
parent 256 640dcf27d2f7
child 258 ada53483727a
*** empty log message ***
configure.in
sdl-config.in
     1.1 --- a/configure.in	Mon Dec 17 19:56:28 2001 +0000
     1.2 +++ b/configure.in	Tue Dec 18 00:18:49 2001 +0000
     1.3 @@ -2174,14 +2174,15 @@
     1.4  if test $ARCH = linux -o $ARCH = freebsd -o $ARCH = bsdi; then
     1.5    SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib"
     1.6  fi
     1.7 -
     1.8  if test $ARCH = solaris; then
     1.9    SDL_RLD_FLAGS="-R\${exec_prefix}/lib"
    1.10  fi
    1.11 -
    1.12 -if test $ARCH = openbsd; then
    1.13 -  SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib $SYSTEM_LIBS"
    1.14 +if test $ARCH = openbsd -o $ARCH = bsdi; then
    1.15 +    SHARED_SYSTEM_LIBS="$SYSTEM_LIBS"
    1.16 +else
    1.17 +    SHARED_SYSTEM_LIBS=""
    1.18  fi
    1.19 +STATIC_SYSTEM_LIBS="$SYSTEM_LIBS"
    1.20  
    1.21  dnl Output the video drivers we use
    1.22  if test x$enable_video = xtrue; then
    1.23 @@ -2199,15 +2200,16 @@
    1.24  AC_SUBST(CDROM_DRIVERS)
    1.25  AC_SUBST(SDL_EXTRADIRS)
    1.26  AC_SUBST(SDL_EXTRALIBS)
    1.27 -AC_SUBST(SYSTEM_LIBS)
    1.28  
    1.29  dnl Expand the cflags and libraries needed by apps using SDL
    1.30  AC_SUBST(SDL_CFLAGS)
    1.31  AC_SUBST(SDL_LIBS)
    1.32  AC_SUBST(SDL_RLD_FLAGS)
    1.33  
    1.34 -dnl Expand the libraries needed for static linking
    1.35 -AC_SUBST(SYSTEM_LIBS)
    1.36 +dnl Expand the libraries needed for static and dynamic linking
    1.37 +AC_SUBST(STATIC_SYSTEM_LIBS)
    1.38 +AC_SUBST(SHARED_SYSTEM_LIBS)
    1.39 +
    1.40  dnl Expand the include directories for building SDL
    1.41  CFLAGS="$CFLAGS -I\$(top_srcdir)/include"
    1.42  CFLAGS="$CFLAGS -I\$(top_srcdir)/include/SDL"
     2.1 --- a/sdl-config.in	Mon Dec 17 19:56:28 2001 +0000
     2.2 +++ b/sdl-config.in	Tue Dec 18 00:18:49 2001 +0000
     2.3 @@ -49,12 +49,12 @@
     2.4        ;;
     2.5  @ENABLE_SHARED_TRUE@    --libs)
     2.6  @ENABLE_SHARED_TRUE@      libdirs="-L@libdir@ @SDL_RLD_FLAGS@"
     2.7 -@ENABLE_SHARED_TRUE@      echo $libdirs @SDL_LIBS@
     2.8 +@ENABLE_SHARED_TRUE@      echo $libdirs @SDL_LIBS@ @SHARED_SYSTEM_LIBS@
     2.9  @ENABLE_SHARED_TRUE@      ;;
    2.10  @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@    --static-libs)
    2.11  @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@    --libs|--static-libs)
    2.12  @ENABLE_STATIC_TRUE@      libdirs="-L@libdir@ @SDL_RLD_FLAGS@"
    2.13 -@ENABLE_STATIC_TRUE@      echo $libdirs @SDL_LIBS@ @SYSTEM_LIBS@
    2.14 +@ENABLE_STATIC_TRUE@      echo $libdirs @SDL_LIBS@ @STATIC_SYSTEM_LIBS@
    2.15  @ENABLE_STATIC_TRUE@      ;;
    2.16      *)
    2.17        echo "${usage}" 1>&2