60 lines
2.9 KiB
Text
60 lines
2.9 KiB
Text
--- configure.orig Wed Jul 14 09:34:14 2004
|
|
+++ configure Thu Feb 17 15:43:03 2005
|
|
@@ -2033,35 +2033,35 @@
|
|
echo "*** to the full path to pkg-config."
|
|
echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
|
|
else
|
|
PKG_CONFIG_MIN_VERSION=0.9.0
|
|
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
|
|
- echo "$as_me:$LINENO: checking for libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.0 gal-2.0 libxml-2.0 sword" >&5
|
|
-echo $ECHO_N "checking for libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.0 gal-2.0 libxml-2.0 sword... $ECHO_C" >&6
|
|
+ echo "$as_me:$LINENO: checking for libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.6 gal-2.4 libxml-2.0 sword" >&5
|
|
+echo $ECHO_N "checking for libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.6 gal-2.4 libxml-2.0 sword... $ECHO_C" >&6
|
|
|
|
- if $PKG_CONFIG --exists "libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.0 gal-2.0 libxml-2.0 sword" ; then
|
|
+ if $PKG_CONFIG --exists "libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.6 gal-2.4 libxml-2.0 sword" ; then
|
|
echo "$as_me:$LINENO: result: yes" >&5
|
|
echo "${ECHO_T}yes" >&6
|
|
succeeded=yes
|
|
|
|
echo "$as_me:$LINENO: checking GNOME_CFLAGS" >&5
|
|
echo $ECHO_N "checking GNOME_CFLAGS... $ECHO_C" >&6
|
|
- GNOME_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.0 gal-2.0 libxml-2.0 sword"`
|
|
+ GNOME_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.6 gal-2.4 libxml-2.0 sword"`
|
|
echo "$as_me:$LINENO: result: $GNOME_CFLAGS" >&5
|
|
echo "${ECHO_T}$GNOME_CFLAGS" >&6
|
|
|
|
echo "$as_me:$LINENO: checking GNOME_LIBS" >&5
|
|
echo $ECHO_N "checking GNOME_LIBS... $ECHO_C" >&6
|
|
- GNOME_LIBS=`$PKG_CONFIG --libs "libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.0 gal-2.0 libxml-2.0 sword"`
|
|
+ GNOME_LIBS=`$PKG_CONFIG --libs "libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.6 gal-2.4 libxml-2.0 sword"`
|
|
echo "$as_me:$LINENO: result: $GNOME_LIBS" >&5
|
|
echo "${ECHO_T}$GNOME_LIBS" >&6
|
|
else
|
|
GNOME_CFLAGS=""
|
|
GNOME_LIBS=""
|
|
## If we have a custom action on failure, don't print errors, but
|
|
## do set a variable so people can do so.
|
|
- GNOME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.0 gal-2.0 libxml-2.0 sword"`
|
|
+ GNOME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomeui-2.0 gtk+-2.0 libgtkhtml-3.6 gal-2.4 libxml-2.0 sword"`
|
|
|
|
fi
|
|
|
|
|
|
|
|
@@ -23854,13 +23854,13 @@
|
|
fi
|
|
|
|
packagedatadir=share/${PACKAGE}
|
|
packagedocdir=share/doc/${PACKAGE}
|
|
|
|
-packagepixmapsdir=share/pixmaps/${PACKAGE}
|
|
+packagepixmapsdir=share/gnome/pixmaps/${PACKAGE}
|
|
packagehelpdir=share/gnome/help/${PACKAGE}
|
|
-packagemenudir=share/applications
|
|
+packagemenudir=share/gnome/applications
|
|
|
|
NO_PREFIX_PACKAGE_DATA_DIR="${packagedatadir}"
|
|
|
|
PACKAGE_DATA_DIR="${packageprefix}/${packagedatadir}"
|
|
|