diff options
| author | David Schleef <ds@schleef.org> | 2004-09-02 22:45:09 +0000 |
|---|---|---|
| committer | David Schleef <ds@schleef.org> | 2004-09-02 22:45:09 +0000 |
| commit | 201587f55a514d800c10b380eec9f34eb61fa5af (patch) | |
| tree | 533244ecf8dd2094050e286f8254e176a8cddf87 /configure.ac | |
| parent | 28a4f879bdf0351676c2420010979e81e1b35e99 (diff) | |
| download | liboil-201587f55a514d800c10b380eec9f34eb61fa5af.tar.gz | |
* configure.ac: remove strict glib dependency
* liboil-0.1-uninstalled.pc.in: remove glib
* liboil-0.1.pc.in: remove glib
* liboil/Makefile.am: remove glib dependency, make conv_sse an i386
source
* liboil/liboilcpu.c: handle non-Linux builds
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index b38843e..58f1f79 100644 --- a/configure.ac +++ b/configure.ac @@ -23,10 +23,14 @@ AC_PROG_CC([c99]) PKG_CHECK_MODULES(GLIB, glib-2.0, HAVE_GLIB=yes, HAVE_GLIB=no) AC_SUBST(GLIB_LIBS) AC_SUBST(GLIB_CFLAGS) -if test x"$HAVE_GLIB" = "xno"; then - AC_MSG_ERROR([cannot find glib-2.0, which is required to build liboil]) -fi - +AC_ARG_ENABLE(glib, +AC_HELP_STRING([--disable-glib],[disable usage of glib]), +[case "${enableval}" in + yes) HAVE_GLIB=yes ;; + no) HAVE_GLIB=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --disable-glib) ;; +esac]) +AM_CONDITIONAL(HAVE_GLIB, test "x$HAVE_GLIB" = "xyes") dnl Set up conditionals for (target) architecture: dnl ============================================== @@ -69,7 +73,7 @@ fi LIBOIL_CFLAGS="$LIBOIL_CFLAGS -D_GNU_SOURCE -D_POSIX_C_SOURCE=200112L -I\$(top_srcdir)" AC_SUBST(LIBOIL_CFLAGS) -LIBOIL_LIBS="\$(top_builddir)/liboil/liboil-$LIBOIL_MAJORMINOR.la $GLIB_LIBS" +LIBOIL_LIBS="\$(top_builddir)/liboil/liboil-$LIBOIL_MAJORMINOR.la" AC_SUBST(LIBOIL_LIBS) pkgconfigdir="\$(libdir)/pkgconfig" |