diff options
author | Lennart Poettering <lennart@poettering.net> | 2004-09-12 23:29:54 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2004-09-12 23:29:54 +0000 |
commit | b681622b17e23878cdd0683fdf57dcc35c562c43 (patch) | |
tree | a4acdf5e6bdd6f3b150c07022227a945b6dd38d0 /configure.ac | |
parent | b772564a4eeab6d32ba9b7be9fb9beed1c12c999 (diff) |
build system update
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@194 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 08b1f324..62dc37d4 100644 --- a/configure.ac +++ b/configure.ac @@ -47,7 +47,11 @@ AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h limits.h malloc.h netdb.h netin ACX_PTHREAD AC_PATH_XTRA -AM_CONDITIONAL(X_DISPLAY_MISSING, test "x$X_DISPLAY_MISSING" != "x") + +HAVE_X11=0 +test "x$no_x" != "xyes" && HAVE_X11=1 +AC_SUBST(HAVE_X11) +AM_CONDITIONAL(HAVE_X11, test "x$no_x" != "xyes") # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST @@ -81,17 +85,23 @@ PKG_CHECK_MODULES(LIBSNDFILE, [ sndfile >= 1.0.0 ]) AC_SUBST(LIBSNDFILE_CFLAGS) AC_SUBST(LIBSNDFILE_LIBS) -PKG_CHECK_MODULES(ASOUNDLIB, [ alsa >= 1.0.0 ]) +PKG_CHECK_MODULES(ASOUNDLIB, [ alsa >= 1.0.0 ], [HAVE_ALSA=1], [HAVE_ALSA=0]) AC_SUBST(ASOUNDLIB_CFLAGS) -AC_SUBST(ASOUNDLIB_LIBS) +AC_SUBST(ASOUNDLIB_LIBS) +AC_SUBST(HAVE_ALSA) +AM_CONDITIONAL([HAVE_ALSA], [test "x$HAVE_ALSA" = x1]) -PKG_CHECK_MODULES(GLIB20, [ glib-2.0 >= 2.4.0 ]) +PKG_CHECK_MODULES(GLIB20, [ glib-2.0 >= 2.4.0 ], HAVE_GLIB20=1, HAVE_GLIB20=0) AC_SUBST(GLIB20_CFLAGS) AC_SUBST(GLIB20_LIBS) +AC_SUBST(HAVE_GLIB20) +AM_CONDITIONAL([HAVE_GLIB20], [test "x$HAVE_GLIB20" = x1]) -PKG_CHECK_MODULES(GLIB12, [ glib >= 1.2.0 ]) +PKG_CHECK_MODULES(GLIB12, [ glib >= 1.2.0 ], HAVE_GLIB12=1, HAVE_GLIB12=0) AC_SUBST(GLIB12_CFLAGS) AC_SUBST(GLIB12_LIBS) +AC_SUBST(HAVE_GLIB12) +AM_CONDITIONAL([HAVE_GLIB12], [test "x$HAVE_GLIB12" = x1]) # If using GCC specifiy some additional parameters if test "x$GCC" = "xyes" ; then |