Commit 2d58166b authored by Yves Combe's avatar Yves Combe
Browse files

Patch to fix compilation (libdir and X path) in x86_64, by Göran Uddeborg,...

Patch to fix compilation (libdir and X path) in x86_64, by Göran Uddeborg, thanks. Python need another check.
parent d29e642e
2005-08-16 Yves Combe <yves@ycombe.net>
Patch to fix compilation (libdir and X path) in x86_64, by Gran Uddeborg, thanks. Python need another check.
* configure.in:
2005-08-16 Yves Combe <yves@ycombe.net>
fix gcompris_set_locale to inform gettext locale has changed.
......
......@@ -82,6 +82,7 @@ AC_MSG_ERROR([You must have popt 1.5 or newer to compile gcompris.]))
AM_ICONV
dnl XRANDR Allow us to set the screen resolution dynamically
AC_PATH_X
AC_ARG_ENABLE(xrandr,
AC_HELP_STRING(
[--disable-xrandr],
......@@ -92,9 +93,9 @@ if test "x$USE_XRANDR" == "xyes" ; then
RANDR_LIBS=
AC_CHECK_LIB(Xrandr, XRRSetScreenConfigAndRate,
[AC_CHECK_HEADER(X11/extensions/Xrandr.h,
RANDR_LIBS="-L/usr/X11R6/lib/ -lXrandr" found_randr=yes,,
RANDR_LIBS="-L$x_libraries -lXrandr" found_randr=yes,,
[#include <X11/Xlib.h>])],
, -L/usr/X11R6/lib/ -lXrandr $ALL_X_LIBS )
, -L$x_libraries $ALL_X_LIBS )
if test "x$found_randr" = "xno"; then
AC_MSG_NOTICE(["Suitable Xrandr extension library not found - you need at least X 4.3. Will not use xrandr for fullscreen."])
......@@ -214,7 +215,7 @@ PACKAGE_HELP_DIR="${myprefix}/${DATADIRNAME}/gnome/help/${PACKAGE}"
AC_SUBST(PACKAGE_HELP_DIR)
dnl Plugin Directory
AC_DEFINE_UNQUOTED(PLUGIN_DIR, "${myprefix}/lib/gcompris", [Gcompris plugins directory])
AC_DEFINE_UNQUOTED(PLUGIN_DIR, "${libdir}/gcompris", [Gcompris plugins directory])
plugindir=$libdir/gcompris
AC_SUBST(plugindir)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment