summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Eduardo Rodrigues DiĆ³genes <carlosd@src.gnome.org>2006-07-21 00:00:10 +0000
committerCarlos Eduardo Rodrigues DiĆ³genes <carlosd@src.gnome.org>2006-07-21 00:00:10 +0000
commit1934d3b75a2cdd4fcd29f1f76a93e3c69e90c0f5 (patch)
treea216ed1ee3e0b715dc87ff20c23e24a72face682
parent406c7e0fdf9ebc020b2e09779340ac81d0d624a9 (diff)
resolved bug #341914 - should not force -I/opt/fdo/include
-rw-r--r--ChangeLog5
-rw-r--r--configure.in7
2 files changed, 6 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 630c3ac..e8946d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-20 Carlos Eduardo Rodrigues Diogenes <cerdiogenes@yahoo.com.br>
+
+ * configure.in: bug #341914: Should not force -I/opt/fdo/include
+ resolved
+
2006-07-12 Carlos Eduardo Rodrigues Diogenes <cerdiogenes@yahoo.com.br>
* configure.in: post-release increment
diff --git a/configure.in b/configure.in
index 8511e4d..a97981a 100644
--- a/configure.in
+++ b/configure.in
@@ -38,7 +38,7 @@ GNOME_MAG_VERSION="$GNOME_MAG_MAJOR_VERSION.$GNOME_MAG_MINOR_VERSION.$GNOME_MAG_
AM_INIT_AUTOMAKE(gnome-mag, $GNOME_MAG_VERSION)
AM_MAINTAINER_MODE
-IT_PROG_INTLTOOL([0.34.90])
+IT_PROG_INTLTOOL([0.35.0])
AC_PROG_CC
AC_LIBTOOL_WIN32_DLL
@@ -155,7 +155,6 @@ if test "x$XDAMAGE_LIBS" = x; then
LIBS="$save_LIBS"
else
X_LIBS="$X_LIBS $XDAMAGE_LIBS"
- CFLAGS="-I /opt/fdo/include $CFLAGS"
AC_CHECK_HEADER(X11/extensions/Xdamage.h, have_xdamage=yes)
if test "x$have_xdamage" = x; then
AC_CHECK_HEADER(X11/Xdamage.h, have_xdamage=yes)
@@ -164,7 +163,6 @@ if test "x$XDAMAGE_LIBS" = x; then
fi
else
X_LIBS="$X_LIBS $XDAMAGE_LIBS"
- CFLAGS="-I /opt/fdo/include $CFLAGS"
AC_CHECK_HEADER(X11/extensions/Xdamage.h, have_xdamage=yes)
if test "x$have_xdamage" = x; then
AC_CHECK_HEADER(X11/Xdamage.h, have_xdamage=yes)
@@ -193,13 +191,11 @@ if test "x$XFIXES_LIBS" = x; then
LIBS="$save_LIBS"
else
X_LIBS="$X_LIBS $XFIXES_LIBS"
- CFLAGS="-I /opt/fdo/include $CFLAGS"
AC_CHECK_HEADER(X11/extensions/Xfixes.h, have_xfixes=yes)
AC_DEFINE(HAVE_XFIXES, 1, [The XFIXES extension is present])
fi
else
X_LIBS="$X_LIBS $XFIXES_LIBS"
- CFLAGS="-I /opt/fdo/include $CFLAGS"
AC_CHECK_HEADER(X11/extensions/Xfixes.h, have_xfixes=yes)
AC_DEFINE(HAVE_XFIXES, 1, [The XFIXES extension is present])
fi
@@ -226,7 +222,6 @@ PKG_CHECK_MODULES(DEPS, [
gdk-pixbuf-xlib-2.0 >= 2.1.0
])
AC_SUBST(DEPS_LIBS)
-DEPS_CFLAGS="-I /opt/fdo/include $DEPS_CFLAGS"
AC_SUBST(DEPS_CFLAGS)
PKG_CHECK_MODULES(TEST, [