Mercurial > sdl-ios-xcode

comparison configure.in @ 1127:fb8818ee9112

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Date: Mon, 22 Aug 2005 04:22:46 -0400 From: "Ryan C. Gordon" Subject: [Fwd: SDL patch: make usage of rpath optional] Here's a small patch against current SDL CVS that makes usage of rpath optional, by passing --disable-rpath to configure. This comes in handy when redistributing SDL -- the rpath setting prevents the lib being loaded if it's not in the rpath, which makes redistributing in packages to be installed by non-root users pretty much useless.
author Sam Lantinga <slouken@libsdl.org>
date Tue, 23 Aug 2005 06:36:23 +0000
parents 3e637850c02b
children 609c060fd2a2
comparison
equal deleted inserted replaced
1126:d581fe3f36db 1127:fb8818ee9112
1862 if test x$have_linux_version_h = xyes; then 1862 if test x$have_linux_version_h = xyes; then
1863 CFLAGS="$CFLAGS -DHAVE_LINUX_VERSION_H" 1863 CFLAGS="$CFLAGS -DHAVE_LINUX_VERSION_H"
1864 fi 1864 fi
1865 } 1865 }
1866 1866
1867 dnl Check if we want to use RPATH
1868 CheckRPATH()
1869 {
1870 AC_ARG_ENABLE(rpath,
1871 [ --enable-rpath use an rpath when linking SDL [default=yes]],
1872 , enable_rpath=yes)
1873 }
1874
1867 case "$target" in 1875 case "$target" in
1868 *-*-linux*|*-*-gnu*|*-*-k*bsd*-gnu) 1876 *-*-linux*|*-*-gnu*|*-*-k*bsd*-gnu)
1869 case "$target" in 1877 case "$target" in
1870 *-*-linux*) ARCH=linux ;; 1878 *-*-linux*) ARCH=linux ;;
1871 *-*-kfreebsd*-gnu) ARCH=kfreebsd-gnu ;; 1879 *-*-kfreebsd*-gnu) ARCH=kfreebsd-gnu ;;
1897 CheckInputEvents 1905 CheckInputEvents
1898 CheckPTHREAD 1906 CheckPTHREAD
1899 CheckSIGACTION 1907 CheckSIGACTION
1900 CheckAltivec 1908 CheckAltivec
1901 CheckLinuxVersion 1909 CheckLinuxVersion
1910 CheckRPATH
1902 1911
1903 # Set up files for the main() stub 1912 # Set up files for the main() stub
1904 if test "x$video_qtopia" = "xyes"; then 1913 if test "x$video_qtopia" = "xyes"; then
1905 SDL_CFLAGS="$SDL_CFLAGS -Dmain=SDL_main" 1914 SDL_CFLAGS="$SDL_CFLAGS -Dmain=SDL_main"
1906 SDL_LIBS="-lSDLmain $SDL_LIBS" 1915 SDL_LIBS="-lSDLmain $SDL_LIBS"
1974 CheckSVGA 1983 CheckSVGA
1975 CheckAAlib 1984 CheckAAlib
1976 CheckOpenGL 1985 CheckOpenGL
1977 CheckPTHREAD 1986 CheckPTHREAD
1978 CheckSIGACTION 1987 CheckSIGACTION
1988 CheckRPATH
1979 # Set up files for the audio library 1989 # Set up files for the audio library
1980 # We use the OSS and ALSA API's, not the Sun audio API 1990 # We use the OSS and ALSA API's, not the Sun audio API
1981 #if test x$enable_audio = xyes; then 1991 #if test x$enable_audio = xyes; then
1982 # CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT" 1992 # CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT"
1983 # AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun" 1993 # AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun"
2020 CheckAAlib 2030 CheckAAlib
2021 CheckOpenGL 2031 CheckOpenGL
2022 CheckPTHREAD 2032 CheckPTHREAD
2023 CheckSIGACTION 2033 CheckSIGACTION
2024 CheckUSBHID 2034 CheckUSBHID
2035 CheckRPATH
2025 # Set up files for the audio library 2036 # Set up files for the audio library
2026 # We use the OSS and ALSA API's, not the Sun audio API 2037 # We use the OSS and ALSA API's, not the Sun audio API
2027 #if test x$enable_audio = xyes; then 2038 #if test x$enable_audio = xyes; then
2028 # CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT" 2039 # CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT"
2029 # AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun" 2040 # AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun"
2057 CheckAAlib 2068 CheckAAlib
2058 CheckOpenGL 2069 CheckOpenGL
2059 CheckPTHREAD 2070 CheckPTHREAD
2060 CheckSIGACTION 2071 CheckSIGACTION
2061 CheckUSBHID 2072 CheckUSBHID
2073 CheckRPATH
2062 # Set up files for the audio library 2074 # Set up files for the audio library
2063 if test x$enable_audio = xyes; then 2075 if test x$enable_audio = xyes; then
2064 CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT" 2076 CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT"
2065 AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun" 2077 AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun"
2066 AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la" 2078 AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la"
2098 CheckAAlib 2110 CheckAAlib
2099 CheckOpenGL 2111 CheckOpenGL
2100 CheckPTHREAD 2112 CheckPTHREAD
2101 CheckSIGACTION 2113 CheckSIGACTION
2102 CheckUSBHID 2114 CheckUSBHID
2115 CheckRPATH
2103 # Set up files for the audio library 2116 # Set up files for the audio library
2104 if test x$enable_audio = xyes; then 2117 if test x$enable_audio = xyes; then
2105 CFLAGS="$CFLAGS -DOPENBSD_AUDIO_SUPPORT" 2118 CFLAGS="$CFLAGS -DOPENBSD_AUDIO_SUPPORT"
2106 AUDIO_SUBDIRS="$AUDIO_SUBDIRS openbsd" 2119 AUDIO_SUBDIRS="$AUDIO_SUBDIRS openbsd"
2107 AUDIO_DRIVERS="$AUDIO_DRIVERS openbsd/libaudio_openbsd.la" 2120 AUDIO_DRIVERS="$AUDIO_DRIVERS openbsd/libaudio_openbsd.la"
2139 CheckX11 2152 CheckX11
2140 CheckAAlib 2153 CheckAAlib
2141 CheckOpenGL 2154 CheckOpenGL
2142 CheckPTHREAD 2155 CheckPTHREAD
2143 CheckSIGACTION 2156 CheckSIGACTION
2157 CheckRPATH
2144 # Set up files for the audio library 2158 # Set up files for the audio library
2145 if test x$enable_audio = xyes; then 2159 if test x$enable_audio = xyes; then
2146 CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT" 2160 CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT"
2147 AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun" 2161 AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun"
2148 AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la" 2162 AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la"
2181 CheckX11 2195 CheckX11
2182 CheckAAlib 2196 CheckAAlib
2183 CheckOpenGL 2197 CheckOpenGL
2184 CheckPTHREAD 2198 CheckPTHREAD
2185 CheckSIGACTION 2199 CheckSIGACTION
2200 CheckRPATH
2186 # Set up files for the audio library 2201 # Set up files for the audio library
2187 if test x$enable_audio = xyes; then 2202 if test x$enable_audio = xyes; then
2188 CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT" 2203 CFLAGS="$CFLAGS -DSUNAUDIO_SUPPORT"
2189 AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun" 2204 AUDIO_SUBDIRS="$AUDIO_SUBDIRS sun"
2190 AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la" 2205 AUDIO_DRIVERS="$AUDIO_DRIVERS sun/libaudio_sun.la"
2737 AM_CONDITIONAL([ENABLE_SHARED], [test "$enable_shared" = yes]) 2752 AM_CONDITIONAL([ENABLE_SHARED], [test "$enable_shared" = yes])
2738 AM_CONDITIONAL([ENABLE_STATIC], [test "$enable_static" = yes]) 2753 AM_CONDITIONAL([ENABLE_STATIC], [test "$enable_static" = yes])
2739 2754
2740 # Set runtime shared library paths as needed 2755 # Set runtime shared library paths as needed
2741 2756
2742 if test $ARCH = linux -o $ARCH = freebsd -o $ARCH = bsdi; then 2757 if test "x$enable_rpath" = "xyes"; then
2743 SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib" 2758 if test $ARCH = linux -o $ARCH = freebsd -o $ARCH = bsdi; then
2744 fi 2759 SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib"
2745 if test $ARCH = solaris; then 2760 fi
2746 SDL_RLD_FLAGS="-R\${exec_prefix}/lib" 2761 if test $ARCH = solaris; then
2762 SDL_RLD_FLAGS="-R\${exec_prefix}/lib"
2763 fi
2764 else
2765 SDL_RLD_FLAGS=""
2747 fi 2766 fi
2748 2767
2749 case "$ARCH" in 2768 case "$ARCH" in
2750 openbsd | netbsd | bsdi) 2769 openbsd | netbsd | bsdi)
2751 SHARED_SYSTEM_LIBS="$SYSTEM_LIBS" 2770 SHARED_SYSTEM_LIBS="$SYSTEM_LIBS"