Commit df3dba85 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

check for X, respect X_LIBS when searching for libxpm. We can't rely on

2001-07-26  Sven Neumann  <sven@gimp.org>

	* configure.in: check for X, respect X_LIBS when searching for libxpm.
	We can't rely on GTK_LIBS including the X_LIBS any longer.

	* app/errorconsole.[ch]: some const fixes.
parent 6e6749f9
2001-07-26 Sven Neumann <sven@gimp.org>
* configure.in: check for X, respect X_LIBS when searching for libxpm.
We can't rely on GTK_LIBS including the X_LIBS any longer.
* app/errorconsole.[ch]: some const fixes.
2001-07-25 Michael Natterer <mitch@gimp.org>
* gtkrc
......
......@@ -95,9 +95,9 @@ error_console_free (void)
}
}
gint
error_console_write_file (gchar *path,
gint textscope)
static gboolean
error_console_write_file (const gchar *path,
gint textscope)
{
#if 0
gint fd;
......@@ -227,7 +227,7 @@ error_console_menu_callback (gint textscope)
#endif
}
static gint
static gboolean
text_clicked_callback (GtkWidget *widget,
GdkEventButton *event,
gpointer data)
......@@ -357,7 +357,7 @@ error_console_create (void)
}
void
error_console_add (gchar *errormsg)
error_console_add (const gchar *errormsg)
{
if (!error_console)
{
......
......@@ -23,7 +23,7 @@
#define __ERROR_CONSOLE_H__
void error_console_add (gchar *errormsg);
void error_console_add (const gchar *errormsg);
GtkWidget * error_console_create (void);
void error_console_free (void);
......
......@@ -91,6 +91,8 @@ ALL_LINGUAS="ca cs da de en_GB es fi fr ga gl hu hr it ja ko nl no pl pt_BR ro r
AM_GNU_GETTEXT
AC_PATH_XTRA
dnl Find pkg-config
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
if test x$PKG_CONFIG = xno ; then
......@@ -230,8 +232,7 @@ else
fi
AM_CONDITIONAL(HAVE_ASM_MMX, test x$have_asm_mmx = xtrue)
dnl Check if building for X11
dnl Check if building for GTK+-X11
gdk_target=`$PKG_CONFIG --variable=target gtk+-2.0`
if test "$gdk_target" = x11; then
dnl Test for Xmu
......@@ -248,7 +249,7 @@ if test "$gdk_target" = x11; then
fi
else
AC_MSG_WARN([
*** Not building for X11 (GDK backend is $gdk_target).
*** Not building for GTK+-X11 (GDK backend is $gdk_target).
*** Webbrowser plug-in and gimp-remote will not be built.])
fi
......@@ -351,15 +352,6 @@ dnl Test for libmpeg
AC_MSG_WARN(*** MPEG plug-in will not be built (MPEG library not found) ***))
fi
dnl Test for libXpm
if test -z "$LIBXPM"; then
AC_CHECK_LIB(Xpm, XpmReadFileToXpmImage,
AC_CHECK_HEADER(X11/xpm.h,
XPM='xpm'; LIBXPM='-lXpm',
AC_MSG_WARN(*** XPM plug-in will not be built (XPM header file not found) ***)),
AC_MSG_WARN(*** XPM plug-in will not be built (XPM library not found) ***), $X_LIBS)
fi
dnl Check for shared memory
AC_CHECK_HEADER(sys/ipc.h, AC_DEFINE(HAVE_IPC_H), no_sys_ipc=yes)
AC_CHECK_HEADER(sys/shm.h, AC_DEFINE(HAVE_SHM_H), no_sys_shm=yes)
......@@ -545,6 +537,19 @@ CPPFLAGS="$gimp_save_CPPFLAGS"
LDFLAGS="$gimp_save_LDFLAGS"
LIBS="$gimp_save_LIBS"
dnl Test for libXpm
gimp_save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $X_LIBS"
if test -z "$LIBXPM"; then
AC_CHECK_LIB(Xpm, XpmReadFileToXpmImage,
AC_CHECK_HEADER(X11/xpm.h,
XPM='xpm'; LIBXPM="$X_LIBS $X_PRE_LIBS -lX11 -lXpm",
AC_MSG_WARN(*** XPM plug-in will not be built (XPM header file not found) ***)),
AC_MSG_WARN(*** XPM plug-in will not be built (XPM library not found) ***), $X_PRE_LIBS -lX11)
fi
LDFLAGS="$gimp_save_LDFLAGS"
dnl Threads
dnl AC_ARG_WITH(threads, [ --with-threads=[posix] support threading ])
dnl GIMP_THREAD_LIBS=
......@@ -754,6 +759,8 @@ AC_SUBST(LT_CURRENT)
AC_SUBST(LT_REVISION)
AC_SUBST(LT_AGE)
AC_SUBST(X_LIBS)
AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
......
Markdown is supported
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