diff options
| author | Dave Camp <dave@ximian.com> | 2002-03-28 19:54:40 +0000 |
|---|---|---|
| committer | Dave Camp <campd@src.gnome.org> | 2002-03-28 19:54:40 +0000 |
| commit | cec1840cd9fd1d7adeed18cdb7ba1b61de4ac521 (patch) | |
| tree | 837d31b6e2552568c3c2302f8039f371d5f9ca2d /configure.in | |
| parent | 1749b72da0615f2980d0998f7b0950eb104e9bec (diff) | |
| download | nautilus-cec1840cd9fd1d7adeed18cdb7ba1b61de4ac521.tar.gz | |
Check for and include X libraries explicitly.
2002-03-28 Dave Camp <dave@ximian.com>
* configure.in: Check for and include X libraries explicitly.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 41 |
1 files changed, 39 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 213e726b9..02d403c71 100644 --- a/configure.in +++ b/configure.in @@ -128,6 +128,43 @@ AM_CONDITIONAL(X86_OPTIMIZED, test "x$_system_is_x86" = "xyes") dnl ========================================================================== +dnl X + +x_libs="`$PKG_CONFIG --libs pangox`" +case x_libs in + *-lX11*) pango_omitted_x_deps=no ;; + *) pango_omitted_x_deps=yes ;; +esac + +x_cflags="`$PKG_CONFIG --cflags pangox`" +x_extra_libs= + +if test $pango_omitted_x_deps = yes ; then + AC_PATH_XTRA + + if test x$no_x = xyes ; then + AC_MSG_ERROR([X development libraries not found]) + fi + + x_libs="$X_LIBS -lX11 $X_EXTRA_LIBS" +fi + +## Strip the .la files + +x_libs_for_checks=$x_libs +#for I in $x_libs ; do +# case $I in +# *.la) ;; +# *) x_libs_for_checks="$x_libs_for_checks $I" ;; +# esac +#done + +AC_CHECK_LIB(X11, XOpenDisplay, :, + AC_MSG_ERROR([*** libX11 not found. Check 'config.log' for more details.]), + $x_libs_for_checks) + +dnl ========================================================================== + dnl cdda AM_CONDITIONAL(HAVE_CDDA, false) @@ -272,9 +309,9 @@ AC_SUBST(LIBNAUTILUS_IDL_INCLUDES) dnl core nautilus (must list bonobo-activation and libbonobo because idldir does not respect "requires") CORE_MODULES="eel-2.0 librsvg-2.0 bonobo-activation-2.0 libbonobo-2.0 libbonoboui-2.0 esound gnome-desktop-2.0 $EXTRA_CORE_MODULES" -CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES`" +CORE_CFLAGS="`$PKG_CONFIG --cflags $CORE_MODULES` $x_cflags" AC_SUBST(CORE_CFLAGS) -CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $CDDA_LIBS $FAM_LIBS $LIBJPEG" +CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $CDDA_LIBS $FAM_LIBS $LIBJPEG $x_libs" AC_SUBST(CORE_LIBS) CORE_IDL_INCLUDES="`$PKG_CONFIG --variable=idldir $CORE_MODULES | $srcdir/add-include-prefix`" AC_SUBST(CORE_IDL_INCLUDES) |