diff options
| author | iovar <iovar@f606c939-3180-4ac9-a4b8-4b8779d57d0a> | 2006-10-29 21:52:39 +0000 |
|---|---|---|
| committer | iovar <iovar@f606c939-3180-4ac9-a4b8-4b8779d57d0a> | 2006-10-29 21:52:39 +0000 |
| commit | 458b0756afae2b19b1083d76109d74f208943a26 (patch) | |
| tree | 611c4759e311897776628bd8988d77977758ef09 /rMD-exp | |
| parent | bcb46b0878f49e00287084f4d5b0189281db73b9 (diff) | |
moved some stuff around, so that missing X_PRE_LIBS doesn't make all other libraries fail. libICE and libSM checks were added.
git-svn-id: https://recordmydesktop.svn.sourceforge.net/svnroot/recordmydesktop/trunk@128 f606c939-3180-4ac9-a4b8-4b8779d57d0a
Diffstat (limited to 'rMD-exp')
| -rw-r--r-- | rMD-exp/configure.ac | 21 | ||||
| -rw-r--r-- | rMD-exp/src/Makefile.am | 6 |
2 files changed, 16 insertions, 11 deletions
diff --git a/rMD-exp/configure.ac b/rMD-exp/configure.ac index 11e6243..a9fdf87 100644 --- a/rMD-exp/configure.ac +++ b/rMD-exp/configure.ac @@ -22,22 +22,27 @@ AC_HEADER_STDC AC_PATH_X AC_PATH_XTRA -AC_CHECK_HEADER([png.h]) -AC_CHECK_HEADER([alsa/asoundlib.h]) -AC_CHECK_HEADERS([sys/time.h unistd.h vorbis/vorbisfile.h ]) +if test "x$x_libraries" != "x" && test "x$x_libraries" != xNONE ; then + echo "X libraries are found in $x_libraries" + LIBS="-L$x_libraries $LIBS"; +fi -LDFLAGS="$LD_FLAGS -L$x_libraries $X_LIBS $X_EXTRA_LIBS $X_PRE_LIBS" - -#no-O3s-thx.patch ;) -CFLAGS="${CFLAGS} -Wall -D_THREAD_SAFE -pthread" +if test "x$x_includes" != "x" && test "x$x_includes" != xNONE ; then + echo "X includes are found in $x_includes" + CFLAGS="-I$x_includes $CFLAGS"; +fi +AC_CHECK_HEADER([alsa/asoundlib.h]) +AC_CHECK_HEADERS([sys/time.h unistd.h vorbis/vorbisfile.h ]) # Checks for libraries. AC_CHECK_LIB([m],[isnan],,) AC_CHECK_LIB([z],[deflate],,) +AC_CHECK_LIB([ICE],[IceOpenConnection],,AC_MSG_ERROR([Can't find libICE]),) +AC_CHECK_LIB([SM],[SmcOpenConnection],,AC_MSG_ERROR([Can't find libSM]),) AC_CHECK_LIB([X11],[XOpenDisplay],,AC_MSG_ERROR([Can't find libX11]), -L$x_libraries $X_PRE_LIBS) AC_CHECK_LIB([Xext],[XShmQueryVersion],,AC_MSG_ERROR([Can't find libXext])) @@ -49,10 +54,10 @@ AC_CHECK_LIB([vorbisenc],[vorbis_encode_init],,AC_MSG_ERROR([Can't find libvorbi AC_CHECK_LIB([ogg],[ogg_stream_init],,AC_MSG_ERROR([Can't find libogg])) AC_CHECK_LIB([theora],[theora_encode_YUVin],,AC_MSG_ERROR([Can't find libtheora])) AC_CHECK_LIB([pthread],[pthread_mutex_lock],,AC_MSG_ERROR([Can't find libpthread])) - AC_CHECK_LIB([asound],[snd_pcm_drain],,AC_MSG_ERROR([Can't find libasound])) + # Checks for typedefs, structures, and compiler characteristics. # Checks for library functions. diff --git a/rMD-exp/src/Makefile.am b/rMD-exp/src/Makefile.am index 7bc3e1b..e510350 100644 --- a/rMD-exp/src/Makefile.am +++ b/rMD-exp/src/Makefile.am @@ -25,7 +25,7 @@ recordmydesktop_SOURCES= recordmydesktop.c\ rmd_cache.c\ load_cache.c -INCLUDES= $(all_includes) -I../include -I$x_includes - -recordmydesktop_LDFLAGS = -D_THREAD_SAFE -pthread -Wall +INCLUDES= $(all_includes) -I../include +recordmydesktop_LDFLAGS = @X_LIBS@ @X_EXTRA_LIBS@ @X_PRE_LIBS@ +recordmydesktop_CFLAGS = -D_THREAD_SAFE -pthread -Wall |