kopia lustrzana https://gitlab.com/sane-project/frontends
Added GIMP 1.3 support. Added support for autoheader. Patch from Julien
BLACHE <jb@jblache.org>.33-incorporate-downstream-patches
Henning Geinitz
rodzic
3f6afae910
commit
5f8686e82f
|
|
@ -1,3 +1,10 @@
|
|||
2003-03-23 Henning Meier-Geinitz <henning@meier-geinitz.de>
|
||||
|
||||
* acinclude.m4 aclocal.m4 configure configure.in
|
||||
include/sane/config.h.in src/xscanimage.c: Added GIMP 1.3 support.
|
||||
Added support for autoheader. Patch from Julien BLACHE
|
||||
<jb@jblache.org>.
|
||||
|
||||
2003-03-22 Henning Meier-Geinitz <henning@meier-geinitz.de>
|
||||
|
||||
* src/xcam.c: Use a scrollbar if the options dialog gets too big.
|
||||
|
|
|
|||
188
acinclude.m4
188
acinclude.m4
|
|
@ -1,6 +1,7 @@
|
|||
# acinclude.m4 for sane-frontends
|
||||
# AM_PATH_GTK
|
||||
# AM_PATH_GIMP
|
||||
# AM_PATH_GIMP_1_4
|
||||
# AM_PATH_SANE
|
||||
|
||||
######################################################################
|
||||
|
|
@ -421,6 +422,193 @@ dnl ok, gimp does not work, so we have to use the gtk_* things again
|
|||
])
|
||||
|
||||
|
||||
######################################################################
|
||||
# Configure paths for GIMP-1.4
|
||||
# Manish Singh 98-6-11
|
||||
# Shamelessly stolen from Owen Taylor
|
||||
|
||||
dnl AM_PATH_GIMP_1_4([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
|
||||
dnl Test for GIMP, and define GIMP_CFLAGS and GIMP_LIBS
|
||||
dnl
|
||||
AC_DEFUN(AM_PATH_GIMP_1_4,
|
||||
[dnl
|
||||
dnl Get the cflags and libraries from the gimptool-1.3 script
|
||||
dnl
|
||||
AC_ARG_WITH(gimp-prefix,[ --with-gimp-prefix=PFX Prefix where GIMP is installed (optional)],
|
||||
gimptool_prefix="$withval", gimptool_prefix="")
|
||||
AC_ARG_WITH(gimp-exec-prefix,[ --with-gimp-exec-prefix=PFX Exec prefix where GIMP is installed (optional)],
|
||||
gimptool_exec_prefix="$withval", gimptool_exec_prefix="")
|
||||
AC_ARG_ENABLE(gimptest, [ --disable-gimptest Do not try to compile and run a test GIMP program],
|
||||
, enable_gimptest=yes)
|
||||
|
||||
if test x$gimptool_exec_prefix != x ; then
|
||||
gimptool_args="$gimptool_args --exec-prefix=$gimptool_exec_prefix"
|
||||
if test x${GIMPTOOL+set} != xset ; then
|
||||
GIMPTOOL=$gimptool_exec_prefix/bin/gimptool-1.3
|
||||
fi
|
||||
fi
|
||||
if test x$gimptool_prefix != x ; then
|
||||
gimptool_args="$gimptool_args --prefix=$gimptool_prefix"
|
||||
if test x${GIMPTOOL+set} != xset ; then
|
||||
GIMPTOOL=$gimptool_prefix/bin/gimptool-1.3
|
||||
fi
|
||||
fi
|
||||
|
||||
AC_PATH_PROG(GIMPTOOL, gimptool-1.3, no)
|
||||
min_gimp_version=ifelse([$1], ,1.3.0,$1)
|
||||
AC_MSG_CHECKING(for GIMP - version >= $min_gimp_version)
|
||||
no_gimp=""
|
||||
if test "$GIMPTOOL" = "no" ; then
|
||||
no_gimp=yes
|
||||
else
|
||||
GIMP_CFLAGS=`$GIMPTOOL $gimptool_args --cflags`
|
||||
GIMP_LIBS=`$GIMPTOOL $gimptool_args --libs`
|
||||
|
||||
GIMP_CFLAGS_NOUI=`$GIMPTOOL $gimptool_args --cflags-noui`
|
||||
noui_test=`echo $GIMP_CFLAGS_NOUI | sed 's/^\(Usage\).*/\1/'`
|
||||
if test "$noui_test" = "Usage" ; then
|
||||
GIMP_CFLAGS_NOUI=$GIMP_CFLAGS
|
||||
GIMP_LIBS_NOUI=$GIMP_LIBS
|
||||
else
|
||||
GIMP_LIBS_NOUI=`$GIMPTOOL $gimptool_args --libs-noui`
|
||||
fi
|
||||
|
||||
GIMP_DATA_DIR=`$GIMPTOOL $gimptool_args --gimpdatadir`
|
||||
GIMP_PLUGIN_DIR=`$GIMPTOOL $gimptool_args --gimpplugindir`
|
||||
nodatadir_test=`echo $GIMP_DATA_DIR | sed 's/^\(Usage\).*/\1/'`
|
||||
if test "$nodatadir_test" = "Usage" ; then
|
||||
GIMP_DATA_DIR=""
|
||||
GIMP_PLUGIN_DIR=""
|
||||
fi
|
||||
|
||||
gimptool_major_version=`$GIMPTOOL $gimptool_args --version | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
|
||||
gimptool_minor_version=`$GIMPTOOL $gimptool_args --version | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
|
||||
gimptool_micro_version=`$GIMPTOOL $gimptool_args --version | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
|
||||
if test "x$enable_gimptest" = "xyes" ; then
|
||||
ac_save_CFLAGS="$CFLAGS"
|
||||
ac_save_LIBS="$LIBS"
|
||||
CFLAGS="$CFLAGS $GIMP_CFLAGS"
|
||||
LIBS="$LIBS $GIMP_LIBS"
|
||||
dnl
|
||||
dnl Now check if the installed GIMP is sufficiently new. (Also sanity
|
||||
dnl checks the results of gimptool-1.3 to some extent
|
||||
dnl
|
||||
rm -f conf.gimptest
|
||||
AC_TRY_RUN([
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <libgimp/gimp.h>
|
||||
|
||||
GimpPlugInInfo PLUG_IN_INFO =
|
||||
{
|
||||
NULL, /* init_proc */
|
||||
NULL, /* quit_proc */
|
||||
NULL, /* query_proc */
|
||||
NULL /* run_proc */
|
||||
};
|
||||
|
||||
int main ()
|
||||
{
|
||||
int major, minor, micro;
|
||||
char *tmp_version;
|
||||
|
||||
system ("touch conf.gimptest");
|
||||
|
||||
/* HP/UX 9 (%@#!) writes to sscanf strings */
|
||||
tmp_version = g_strdup("$min_gimp_version");
|
||||
if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
|
||||
printf("%s, bad version string\n", "$min_gimp_version");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
if (($gimptool_major_version > major) ||
|
||||
(($gimptool_major_version == major) && ($gimptool_minor_version > minor)) ||
|
||||
(($gimptool_major_version == major) && ($gimptool_minor_version == minor) && ($gimptool_micro_version >= micro)))
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
printf("\n*** 'gimptool-1.3 --version' returned %d.%d.%d, but the minimum version\n", $gimptool_major_version, $gimptool_minor_version, $gimptool_micro_version);
|
||||
printf("*** of GIMP required is %d.%d.%d. If gimptool-1.3 is correct, then it is\n", major, minor, micro);
|
||||
printf("*** best to upgrade to the required version.\n");
|
||||
printf("*** If gimptool-1.3 was wrong, set the environment variable GIMPTOOL\n");
|
||||
printf("*** to point to the correct copy of gimptool-1.3, and remove the file\n");
|
||||
printf("*** config.cache before re-running configure\n");
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
],, no_gimp=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
|
||||
CFLAGS="$ac_save_CFLAGS"
|
||||
LIBS="$ac_save_LIBS"
|
||||
fi
|
||||
fi
|
||||
if test "x$no_gimp" = x ; then
|
||||
AC_MSG_RESULT(yes)
|
||||
ifelse([$2], , :, [$2])
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
if test "$GIMPTOOL" = "no" ; then
|
||||
echo "*** The gimptool-1.3 script installed by GIMP could not be found"
|
||||
echo "*** If GIMP was installed in PREFIX, make sure PREFIX/bin is in"
|
||||
echo "*** your path, or set the GIMPTOOL environment variable to the"
|
||||
echo "*** full path to gimptool-1.3."
|
||||
else
|
||||
if test -f conf.gimptest ; then
|
||||
:
|
||||
else
|
||||
echo "*** Could not run GIMP test program, checking why..."
|
||||
CFLAGS="$CFLAGS $GIMP_CFLAGS"
|
||||
LIBS="$LIBS $GIMP_LIBS"
|
||||
AC_TRY_LINK([
|
||||
#include <stdio.h>
|
||||
#include <libgimp/gimp.h>
|
||||
|
||||
GimpPlugInInfo PLUG_IN_INFO =
|
||||
{
|
||||
NULL, /* init_proc */
|
||||
NULL, /* quit_proc */
|
||||
NULL, /* query_proc */
|
||||
NULL /* run_proc */
|
||||
};
|
||||
], [ return 0; ],
|
||||
[ echo "*** The test program compiled, but did not run. This usually means"
|
||||
echo "*** that the run-time linker is not finding GIMP or finding the wrong"
|
||||
echo "*** version of GIMP. If it is not finding GIMP, you'll need to set your"
|
||||
echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
|
||||
echo "*** to the installed location Also, make sure you have run ldconfig if that"
|
||||
echo "*** is required on your system"
|
||||
echo "***"
|
||||
echo "*** If you have an old version installed, it is best to remove it, although"
|
||||
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
|
||||
[ echo "*** The test program failed to compile or link. See the file config.log for the"
|
||||
echo "*** exact error that occured. This usually means GIMP was incorrectly installed"
|
||||
echo "*** or that you have moved GIMP since it was installed. In the latter case, you"
|
||||
echo "*** may want to edit the gimptool-1.3 script: $GIMPTOOL" ])
|
||||
CFLAGS="$ac_save_CFLAGS"
|
||||
LIBS="$ac_save_LIBS"
|
||||
fi
|
||||
fi
|
||||
GIMP_CFLAGS=""
|
||||
GIMP_LIBS=""
|
||||
GIMP_CFLAGS_NOUI=""
|
||||
GIMP_LIBS_NOUI=""
|
||||
ifelse([$3], , :, [$3])
|
||||
fi
|
||||
AC_SUBST(GIMP_CFLAGS)
|
||||
AC_SUBST(GIMP_LIBS)
|
||||
AC_SUBST(GIMP_CFLAGS_NOUI)
|
||||
AC_SUBST(GIMP_LIBS_NOUI)
|
||||
AC_SUBST(GIMP_DATA_DIR)
|
||||
AC_SUBST(GIMP_PLUGIN_DIR)
|
||||
rm -f conf.gimptest
|
||||
])
|
||||
|
||||
# ********************************************************************
|
||||
# Configure paths for SANE
|
||||
# Oliver Rauch 2000-10-30
|
||||
|
|
|
|||
|
|
@ -13,6 +13,7 @@ dnl PARTICULAR PURPOSE.
|
|||
# acinclude.m4 for sane-frontends
|
||||
# AM_PATH_GTK
|
||||
# AM_PATH_GIMP
|
||||
# AM_PATH_GIMP_1_4
|
||||
# AM_PATH_SANE
|
||||
|
||||
# Configure paths for GTK+
|
||||
|
|
@ -431,6 +432,192 @@ dnl ok, gimp does not work, so we have to use the gtk_* things again
|
|||
])
|
||||
|
||||
|
||||
# Configure paths for GIMP-1.4
|
||||
# Manish Singh 98-6-11
|
||||
# Shamelessly stolen from Owen Taylor
|
||||
|
||||
dnl AM_PATH_GIMP_1_4([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
|
||||
dnl Test for GIMP, and define GIMP_CFLAGS and GIMP_LIBS
|
||||
dnl
|
||||
AC_DEFUN(AM_PATH_GIMP_1_4,
|
||||
[dnl
|
||||
dnl Get the cflags and libraries from the gimptool-1.3 script
|
||||
dnl
|
||||
AC_ARG_WITH(gimp-prefix,[ --with-gimp-prefix=PFX Prefix where GIMP is installed (optional)],
|
||||
gimptool_prefix="$withval", gimptool_prefix="")
|
||||
AC_ARG_WITH(gimp-exec-prefix,[ --with-gimp-exec-prefix=PFX Exec prefix where GIMP is installed (optional)],
|
||||
gimptool_exec_prefix="$withval", gimptool_exec_prefix="")
|
||||
AC_ARG_ENABLE(gimptest, [ --disable-gimptest Do not try to compile and run a test GIMP program],
|
||||
, enable_gimptest=yes)
|
||||
|
||||
if test x$gimptool_exec_prefix != x ; then
|
||||
gimptool_args="$gimptool_args --exec-prefix=$gimptool_exec_prefix"
|
||||
if test x${GIMPTOOL+set} != xset ; then
|
||||
GIMPTOOL=$gimptool_exec_prefix/bin/gimptool-1.3
|
||||
fi
|
||||
fi
|
||||
if test x$gimptool_prefix != x ; then
|
||||
gimptool_args="$gimptool_args --prefix=$gimptool_prefix"
|
||||
if test x${GIMPTOOL+set} != xset ; then
|
||||
GIMPTOOL=$gimptool_prefix/bin/gimptool-1.3
|
||||
fi
|
||||
fi
|
||||
|
||||
AC_PATH_PROG(GIMPTOOL, gimptool-1.3, no)
|
||||
min_gimp_version=ifelse([$1], ,1.3.0,$1)
|
||||
AC_MSG_CHECKING(for GIMP - version >= $min_gimp_version)
|
||||
no_gimp=""
|
||||
if test "$GIMPTOOL" = "no" ; then
|
||||
no_gimp=yes
|
||||
else
|
||||
GIMP_CFLAGS=`$GIMPTOOL $gimptool_args --cflags`
|
||||
GIMP_LIBS=`$GIMPTOOL $gimptool_args --libs`
|
||||
|
||||
GIMP_CFLAGS_NOUI=`$GIMPTOOL $gimptool_args --cflags-noui`
|
||||
noui_test=`echo $GIMP_CFLAGS_NOUI | sed 's/^\(Usage\).*/\1/'`
|
||||
if test "$noui_test" = "Usage" ; then
|
||||
GIMP_CFLAGS_NOUI=$GIMP_CFLAGS
|
||||
GIMP_LIBS_NOUI=$GIMP_LIBS
|
||||
else
|
||||
GIMP_LIBS_NOUI=`$GIMPTOOL $gimptool_args --libs-noui`
|
||||
fi
|
||||
|
||||
GIMP_DATA_DIR=`$GIMPTOOL $gimptool_args --gimpdatadir`
|
||||
GIMP_PLUGIN_DIR=`$GIMPTOOL $gimptool_args --gimpplugindir`
|
||||
nodatadir_test=`echo $GIMP_DATA_DIR | sed 's/^\(Usage\).*/\1/'`
|
||||
if test "$nodatadir_test" = "Usage" ; then
|
||||
GIMP_DATA_DIR=""
|
||||
GIMP_PLUGIN_DIR=""
|
||||
fi
|
||||
|
||||
gimptool_major_version=`$GIMPTOOL $gimptool_args --version | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
|
||||
gimptool_minor_version=`$GIMPTOOL $gimptool_args --version | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
|
||||
gimptool_micro_version=`$GIMPTOOL $gimptool_args --version | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
|
||||
if test "x$enable_gimptest" = "xyes" ; then
|
||||
ac_save_CFLAGS="$CFLAGS"
|
||||
ac_save_LIBS="$LIBS"
|
||||
CFLAGS="$CFLAGS $GIMP_CFLAGS"
|
||||
LIBS="$LIBS $GIMP_LIBS"
|
||||
dnl
|
||||
dnl Now check if the installed GIMP is sufficiently new. (Also sanity
|
||||
dnl checks the results of gimptool-1.3 to some extent
|
||||
dnl
|
||||
rm -f conf.gimptest
|
||||
AC_TRY_RUN([
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <libgimp/gimp.h>
|
||||
|
||||
GimpPlugInInfo PLUG_IN_INFO =
|
||||
{
|
||||
NULL, /* init_proc */
|
||||
NULL, /* quit_proc */
|
||||
NULL, /* query_proc */
|
||||
NULL /* run_proc */
|
||||
};
|
||||
|
||||
int main ()
|
||||
{
|
||||
int major, minor, micro;
|
||||
char *tmp_version;
|
||||
|
||||
system ("touch conf.gimptest");
|
||||
|
||||
/* HP/UX 9 (%@#!) writes to sscanf strings */
|
||||
tmp_version = g_strdup("$min_gimp_version");
|
||||
if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
|
||||
printf("%s, bad version string\n", "$min_gimp_version");
|
||||
exit(1);
|
||||
}
|
||||
|
||||
if (($gimptool_major_version > major) ||
|
||||
(($gimptool_major_version == major) && ($gimptool_minor_version > minor)) ||
|
||||
(($gimptool_major_version == major) && ($gimptool_minor_version == minor) && ($gimptool_micro_version >= micro)))
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
printf("\n*** 'gimptool-1.3 --version' returned %d.%d.%d, but the minimum version\n", $gimptool_major_version, $gimptool_minor_version, $gimptool_micro_version);
|
||||
printf("*** of GIMP required is %d.%d.%d. If gimptool-1.3 is correct, then it is\n", major, minor, micro);
|
||||
printf("*** best to upgrade to the required version.\n");
|
||||
printf("*** If gimptool-1.3 was wrong, set the environment variable GIMPTOOL\n");
|
||||
printf("*** to point to the correct copy of gimptool-1.3, and remove the file\n");
|
||||
printf("*** config.cache before re-running configure\n");
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
],, no_gimp=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
|
||||
CFLAGS="$ac_save_CFLAGS"
|
||||
LIBS="$ac_save_LIBS"
|
||||
fi
|
||||
fi
|
||||
if test "x$no_gimp" = x ; then
|
||||
AC_MSG_RESULT(yes)
|
||||
ifelse([$2], , :, [$2])
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
if test "$GIMPTOOL" = "no" ; then
|
||||
echo "*** The gimptool-1.3 script installed by GIMP could not be found"
|
||||
echo "*** If GIMP was installed in PREFIX, make sure PREFIX/bin is in"
|
||||
echo "*** your path, or set the GIMPTOOL environment variable to the"
|
||||
echo "*** full path to gimptool-1.3."
|
||||
else
|
||||
if test -f conf.gimptest ; then
|
||||
:
|
||||
else
|
||||
echo "*** Could not run GIMP test program, checking why..."
|
||||
CFLAGS="$CFLAGS $GIMP_CFLAGS"
|
||||
LIBS="$LIBS $GIMP_LIBS"
|
||||
AC_TRY_LINK([
|
||||
#include <stdio.h>
|
||||
#include <libgimp/gimp.h>
|
||||
|
||||
GimpPlugInInfo PLUG_IN_INFO =
|
||||
{
|
||||
NULL, /* init_proc */
|
||||
NULL, /* quit_proc */
|
||||
NULL, /* query_proc */
|
||||
NULL /* run_proc */
|
||||
};
|
||||
], [ return 0; ],
|
||||
[ echo "*** The test program compiled, but did not run. This usually means"
|
||||
echo "*** that the run-time linker is not finding GIMP or finding the wrong"
|
||||
echo "*** version of GIMP. If it is not finding GIMP, you'll need to set your"
|
||||
echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
|
||||
echo "*** to the installed location Also, make sure you have run ldconfig if that"
|
||||
echo "*** is required on your system"
|
||||
echo "***"
|
||||
echo "*** If you have an old version installed, it is best to remove it, although"
|
||||
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
|
||||
[ echo "*** The test program failed to compile or link. See the file config.log for the"
|
||||
echo "*** exact error that occured. This usually means GIMP was incorrectly installed"
|
||||
echo "*** or that you have moved GIMP since it was installed. In the latter case, you"
|
||||
echo "*** may want to edit the gimptool-1.3 script: $GIMPTOOL" ])
|
||||
CFLAGS="$ac_save_CFLAGS"
|
||||
LIBS="$ac_save_LIBS"
|
||||
fi
|
||||
fi
|
||||
GIMP_CFLAGS=""
|
||||
GIMP_LIBS=""
|
||||
GIMP_CFLAGS_NOUI=""
|
||||
GIMP_LIBS_NOUI=""
|
||||
ifelse([$3], , :, [$3])
|
||||
fi
|
||||
AC_SUBST(GIMP_CFLAGS)
|
||||
AC_SUBST(GIMP_LIBS)
|
||||
AC_SUBST(GIMP_CFLAGS_NOUI)
|
||||
AC_SUBST(GIMP_LIBS_NOUI)
|
||||
AC_SUBST(GIMP_DATA_DIR)
|
||||
AC_SUBST(GIMP_PLUGIN_DIR)
|
||||
rm -f conf.gimptest
|
||||
])
|
||||
|
||||
# ********************************************************************
|
||||
# Configure paths for SANE
|
||||
# Oliver Rauch 2000-10-30
|
||||
|
|
|
|||
Plik diff jest za duży
Load Diff
34
configure.in
34
configure.in
|
|
@ -21,9 +21,9 @@ BINPROGS="scanadf"
|
|||
SANE_V_MAJOR=1
|
||||
VERSION=${V_MAJOR}.${V_MINOR}.${V_BUILD}${V_EXTRA}
|
||||
PACKAGE_VERSION="$PACKAGE-$VERSION"
|
||||
AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
|
||||
AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
|
||||
AC_DEFINE_UNQUOTED(PACKAGE_VERSION, "$PACKAGE_VERSION")
|
||||
AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Define to the name of the distribution.])
|
||||
AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Define to the version of the distribution.])
|
||||
AC_DEFINE_UNQUOTED(PACKAGE_VERSION, "$PACKAGE_VERSION", [Define to the name and the version of the distribution.])
|
||||
AC_SUBST(PACKAGE)
|
||||
AC_SUBST(VERSION)
|
||||
AC_SUBST(PACKAGE_VERSION)
|
||||
|
|
@ -39,7 +39,13 @@ dnl Check for gimp plugin support
|
|||
AC_MSG_CHECKING([whether GIMP plugin is requested])
|
||||
dnl Default is enabled GIMP plugin
|
||||
AC_ARG_ENABLE(gimp, [ --disable-gimp do not include GIMP plugin mode], USE_GIMP=$enableval, USE_GIMP=yes)
|
||||
AC_ARG_ENABLE(gimp13, [ --enable-gimp13 include GIMP 1.3 plugin mode (this disables GIMP =< 1.2 plugin)], USE_GIMP13=$enableval, USE_GIMP13="no")
|
||||
if test "${USE_GIMP13}" = "yes"; then
|
||||
AC_MSG_RESULT([yes, GIMP 1.3])
|
||||
USE_GIMP="no"
|
||||
else
|
||||
AC_MSG_RESULT($USE_GIMP)
|
||||
fi
|
||||
|
||||
# we cannot use GTK2 with GIMP < 1.3
|
||||
if test "${USE_GIMP}" = "yes"; then
|
||||
|
|
@ -103,6 +109,11 @@ AC_FUNC_MMAP
|
|||
AC_CHECK_FUNCS(atexit mkdir sigprocmask strdup strndup strftime strstr \
|
||||
strsep strtod snprintf usleep strcasecmp strncasecmp getenv isfdtype vsyslog)
|
||||
|
||||
if test "$ac_cv_header_os2_h" = "yes" ; then
|
||||
AC_DEFINE(strncasecmp, strnicmp, [Define for OS/2 only])
|
||||
AC_DEFINE(strcasecmp, stricmp, [Define for OS/2 only])
|
||||
fi
|
||||
|
||||
AC_CHECK_TOOL(RANLIB, ranlib, :)
|
||||
|
||||
AM_PATH_SANE(1.0.0, HAVE_SANE=yes, )
|
||||
|
|
@ -126,8 +137,13 @@ fi
|
|||
# check for GTK2 or GTK >= 0.99.13
|
||||
if test "${USE_GUI}" = "yes"; then
|
||||
|
||||
if test "${USE_GTK2}" = "yes"; then
|
||||
AM_PATH_GTK_2_0(2.0.0, HAVE_GTK=yes, )
|
||||
if test "${USE_GTK2}" = "yes" || test "${USE_GIMP13}" = "yes"; then
|
||||
AM_PATH_GTK_2_0(2.0.0, HAVE_GTK=yes, [
|
||||
if test "${USE_GIMP13}" = "yes"; then
|
||||
AC_MSG_ERROR([*** GIMP 1.3 plugin requested, but GTK+ 2.0 not found ***])
|
||||
else
|
||||
AC_MSG_WARN([*** GTK+ 2.0 not found, falling back to GTK+ < 2.0 if possible ***])
|
||||
fi])
|
||||
fi
|
||||
|
||||
# fallback to GTK < 2 if GTK2 isn't available
|
||||
|
|
@ -139,6 +155,14 @@ if test "${USE_GUI}" = "yes"; then
|
|||
AM_PATH_GIMP(1.0.0, HAVE_GIMP=yes)
|
||||
fi
|
||||
|
||||
if test "${USE_GIMP13}" = "yes"; then
|
||||
AM_PATH_GIMP_1_4(1.3.12, HAVE_GIMP13=yes)
|
||||
if test "${HAVE_GIMP13}" = "yes"; then
|
||||
AC_DEFINE([ENABLE_GIMP_1_3], 1, [Define to 1 if GIMP 1.3 support wanted])
|
||||
AC_DEFINE([HAVE_LIBGIMP_GIMP_H], 1, [Define to 1 if you have the <libgimp/gimp.h> header file.])
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "x${HAVE_GTK}" = "x"; then
|
||||
echo "****************************************************************"
|
||||
echo "WARNING: GTK-0.99.13 or newer is needed for compiling the GUI"
|
||||
|
|
|
|||
|
|
@ -1,79 +1,150 @@
|
|||
#ifndef SANE_CONFIG_H
|
||||
#define SANE_CONFIG_H
|
||||
/* include/sane/config.h.in. Generated from configure.in by autoheader. */
|
||||
|
||||
/* Define if on AIX 3.
|
||||
System headers sometimes define this.
|
||||
We just want to avoid a redefinition error message. */
|
||||
#ifndef _ALL_SOURCE
|
||||
#undef _ALL_SOURCE
|
||||
#endif
|
||||
|
||||
/* Define if using alloca.c. */
|
||||
#undef C_ALLOCA
|
||||
|
||||
/* Define to empty if the keyword does not work. */
|
||||
#undef const
|
||||
|
||||
/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
|
||||
This function is required for alloca.c support on those systems. */
|
||||
/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
|
||||
systems. This function is required for `alloca.c' support on those systems.
|
||||
*/
|
||||
#undef CRAY_STACKSEG_END
|
||||
|
||||
/* Define if you have alloca, as a function or macro. */
|
||||
/* Define to 1 if using `alloca.c'. */
|
||||
#undef C_ALLOCA
|
||||
|
||||
/* Define to 1 if GIMP 1.3 support wanted */
|
||||
#undef ENABLE_GIMP_1_3
|
||||
|
||||
/* Define to 1 if you have `alloca', as a function or macro. */
|
||||
#undef HAVE_ALLOCA
|
||||
|
||||
/* Define if you have <alloca.h> and it should be used (not on Ultrix). */
|
||||
/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
|
||||
*/
|
||||
#undef HAVE_ALLOCA_H
|
||||
|
||||
/* Define if you have a working `mmap' system call. */
|
||||
/* Define to 1 if you have the `atexit' function. */
|
||||
#undef HAVE_ATEXIT
|
||||
|
||||
/* Define to 1 if you have the <fcntl.h> header file. */
|
||||
#undef HAVE_FCNTL_H
|
||||
|
||||
/* Define to 1 if you have the `getenv' function. */
|
||||
#undef HAVE_GETENV
|
||||
|
||||
/* Define to 1 if you have the `getpagesize' function. */
|
||||
#undef HAVE_GETPAGESIZE
|
||||
|
||||
/* Define to 1 if you have the <inttypes.h> header file. */
|
||||
#undef HAVE_INTTYPES_H
|
||||
|
||||
/* Define to 1 if you have the `isfdtype' function. */
|
||||
#undef HAVE_ISFDTYPE
|
||||
|
||||
/* Define to 1 if you have the <libc.h> header file. */
|
||||
#undef HAVE_LIBC_H
|
||||
|
||||
/* Define to 1 if you have the <libgimp/gimpfeatures.h> header file. */
|
||||
#undef HAVE_LIBGIMP_GIMPFEATURES_H
|
||||
|
||||
/* Define to 1 if you have the <libgimp/gimp.h> header file. */
|
||||
#undef HAVE_LIBGIMP_GIMP_H
|
||||
|
||||
/* Define to 1 if you have the `m' library (-lm). */
|
||||
#undef HAVE_LIBM
|
||||
|
||||
/* Define to 1 if you have the `socket' library (-lsocket). */
|
||||
#undef HAVE_LIBSOCKET
|
||||
|
||||
/* Define to 1 if you have the `syslog' library (-lsyslog). */
|
||||
#undef HAVE_LIBSYSLOG
|
||||
|
||||
/* Define to 1 if you have the <memory.h> header file. */
|
||||
#undef HAVE_MEMORY_H
|
||||
|
||||
/* Define to 1 if you have the `mkdir' function. */
|
||||
#undef HAVE_MKDIR
|
||||
|
||||
/* Define to 1 if you have a working `mmap' system call. */
|
||||
#undef HAVE_MMAP
|
||||
|
||||
/* Define as __inline if that's what the C compiler calls it. */
|
||||
#undef inline
|
||||
/* Define to 1 if you have the <os2.h> header file. */
|
||||
#undef HAVE_OS2_H
|
||||
|
||||
/* Define if on MINIX. */
|
||||
#undef _MINIX
|
||||
/* Define to 1 if you have the `sigprocmask' function. */
|
||||
#undef HAVE_SIGPROCMASK
|
||||
|
||||
/* Define to `long' if <sys/types.h> doesn't define. */
|
||||
#undef off_t
|
||||
/* Define to 1 if you have the `snprintf' function. */
|
||||
#undef HAVE_SNPRINTF
|
||||
|
||||
/* Define if the system does not provide POSIX.1 features except
|
||||
with this defined. */
|
||||
#undef _POSIX_1_SOURCE
|
||||
/* Define to 1 if you have the <stdint.h> header file. */
|
||||
#undef HAVE_STDINT_H
|
||||
|
||||
/* Define if you need to in order for stat and other things to work. */
|
||||
#undef _POSIX_SOURCE
|
||||
/* Define to 1 if you have the <stdlib.h> header file. */
|
||||
#undef HAVE_STDLIB_H
|
||||
|
||||
/* Define to `unsigned' if <sys/types.h> doesn't define. */
|
||||
#undef size_t
|
||||
/* Define to 1 if you have the `strcasecmp' function. */
|
||||
#undef HAVE_STRCASECMP
|
||||
|
||||
/* Define to `unsigned char' if <sys/types.h> doesn't define. */
|
||||
#undef u_char
|
||||
/* Define to 1 if you have the `strdup' function. */
|
||||
#undef HAVE_STRDUP
|
||||
|
||||
/* Define to `unsigned int' if <sys/types.h> doesn't define. */
|
||||
#undef u_int
|
||||
/* Define to 1 if you have the `strftime' function. */
|
||||
#undef HAVE_STRFTIME
|
||||
|
||||
/* Define to `unsigned long' if <sys/types.h> doesn't define. */
|
||||
#undef u_long
|
||||
/* Define to 1 if you have the <strings.h> header file. */
|
||||
#undef HAVE_STRINGS_H
|
||||
|
||||
/* Define to `unsigned char' if <sys/types.h> doesn't define. */
|
||||
#undef u_int8_t
|
||||
/* Define to 1 if you have the <string.h> header file. */
|
||||
#undef HAVE_STRING_H
|
||||
|
||||
/* Define to `unsigned short' if <sys/types.h> doesn't define. */
|
||||
#undef u_int16_t
|
||||
/* Define to 1 if you have the `strncasecmp' function. */
|
||||
#undef HAVE_STRNCASECMP
|
||||
|
||||
/* Define to `unsigned int' if <sys/types.h> doesn't define. */
|
||||
#undef u_int32_t
|
||||
/* Define to 1 if you have the `strndup' function. */
|
||||
#undef HAVE_STRNDUP
|
||||
|
||||
/* Define to `long' if <sys/types.h> doesn't define. */
|
||||
#undef ssize_t
|
||||
/* Define to 1 if you have the `strsep' function. */
|
||||
#undef HAVE_STRSEP
|
||||
|
||||
/* Define to `int' if <sys/types.h> doesn't define. */
|
||||
#undef pid_t
|
||||
/* Define to 1 if you have the `strstr' function. */
|
||||
#undef HAVE_STRSTR
|
||||
|
||||
/* Define scsireq_t as `struct scsireq' if necessary. */
|
||||
#undef scsireq_t
|
||||
/* Define to 1 if you have the `strtod' function. */
|
||||
#undef HAVE_STRTOD
|
||||
|
||||
/* Define to the return type of signal handlers. */
|
||||
/* Define to 1 if you have the <sys/stat.h> header file. */
|
||||
#undef HAVE_SYS_STAT_H
|
||||
|
||||
/* Define to 1 if you have the <sys/time.h> header file. */
|
||||
#undef HAVE_SYS_TIME_H
|
||||
|
||||
/* Define to 1 if you have the <sys/types.h> header file. */
|
||||
#undef HAVE_SYS_TYPES_H
|
||||
|
||||
/* Define to 1 if you have the <unistd.h> header file. */
|
||||
#undef HAVE_UNISTD_H
|
||||
|
||||
/* Define to 1 if you have the `usleep' function. */
|
||||
#undef HAVE_USLEEP
|
||||
|
||||
/* Define to 1 if you have the `vsyslog' function. */
|
||||
#undef HAVE_VSYSLOG
|
||||
|
||||
/* Define to the name of the distribution. */
|
||||
#undef PACKAGE
|
||||
|
||||
/* Define to the address where bug reports for this package should be sent. */
|
||||
#undef PACKAGE_BUGREPORT
|
||||
|
||||
/* Define to the full name of this package. */
|
||||
#undef PACKAGE_NAME
|
||||
|
||||
/* Define to the full name and version of this package. */
|
||||
#undef PACKAGE_STRING
|
||||
|
||||
/* Define to the one symbol short name of this package. */
|
||||
#undef PACKAGE_TARNAME
|
||||
|
||||
/* Define to the name and the version of the distribution. */
|
||||
#undef PACKAGE_VERSION
|
||||
|
||||
/* Define as the return type of signal handlers (`int' or `void'). */
|
||||
#undef RETSIGTYPE
|
||||
|
||||
/* If using the C implementation of alloca, define if you know the
|
||||
|
|
@ -81,205 +152,68 @@
|
|||
automatically deduced at run-time.
|
||||
STACK_DIRECTION > 0 => grows toward higher addresses
|
||||
STACK_DIRECTION < 0 => grows toward lower addresses
|
||||
STACK_DIRECTION = 0 => direction of growth unknown
|
||||
*/
|
||||
STACK_DIRECTION = 0 => direction of growth unknown */
|
||||
#undef STACK_DIRECTION
|
||||
|
||||
/* Define if you have the ANSI C header files. */
|
||||
/* Define to 1 if you have the ANSI C header files. */
|
||||
#undef STDC_HEADERS
|
||||
|
||||
/* Define to 1 if NLS is requested. */
|
||||
#undef ENABLE_NLS
|
||||
|
||||
/* Define as 1 if you have catgets and don't want to use GNU gettext. */
|
||||
#undef HAVE_CATGETS
|
||||
|
||||
/* Define as 1 if you have gettext and don't want to use GNU gettext. */
|
||||
#undef HAVE_GETTEXT
|
||||
|
||||
/* Define if your locale.h file contains LC_MESSAGES. */
|
||||
#undef HAVE_LC_MESSAGES
|
||||
|
||||
/* Define to 1 if you have the stpcpy function. */
|
||||
#undef HAVE_STPCPY
|
||||
|
||||
/* Define to the name of the distribution. */
|
||||
#undef PACKAGE
|
||||
|
||||
/* The concatenation of the strings PACKAGE, "-", and VERSION. */
|
||||
#undef PACKAGE_VERSION
|
||||
|
||||
/* Define to the version of the distribution. */
|
||||
#undef VERSION
|
||||
|
||||
/* Define if you have the __argz_count function. */
|
||||
#undef HAVE___ARGZ_COUNT
|
||||
|
||||
/* Define if you have the __argz_next function. */
|
||||
#undef HAVE___ARGZ_NEXT
|
||||
|
||||
/* Define if you have the __argz_stringify function. */
|
||||
#undef HAVE___ARGZ_STRINGIFY
|
||||
|
||||
/* Define if you have the dcgettext function. */
|
||||
#undef HAVE_DCGETTEXT
|
||||
|
||||
/* Define if you have the getcwd function. */
|
||||
#undef HAVE_GETCWD
|
||||
|
||||
/* Define if you have the getenv function. */
|
||||
#undef HAVE_GETENV
|
||||
|
||||
/* Define if you have the getpagesize function. */
|
||||
#undef HAVE_GETPAGESIZE
|
||||
|
||||
/* Define if you have the atexit function. */
|
||||
#undef HAVE_ATEXIT
|
||||
|
||||
/* Define if you have the isfdtype function. */
|
||||
#undef HAVE_ISFDTYPE
|
||||
|
||||
/* Define if you have the mkdir function. */
|
||||
#undef HAVE_MKDIR
|
||||
|
||||
/* Define if you have the munmap function. */
|
||||
#undef HAVE_MUNMAP
|
||||
|
||||
/* Define if you have the putenv function. */
|
||||
#undef HAVE_PUTENV
|
||||
|
||||
/* Define if you have the scsireq_enter function. */
|
||||
#undef HAVE_SCSIREQ_ENTER
|
||||
|
||||
/* Define if you have the sigprocmask function. */
|
||||
#undef HAVE_SIGPROCMASK
|
||||
|
||||
/* Define if you have the setenv function. */
|
||||
#undef HAVE_SETENV
|
||||
|
||||
/* Define if you have the setlocale function. */
|
||||
#undef HAVE_SETLOCALE
|
||||
|
||||
/* Define if you have the stpcpy function. */
|
||||
#undef HAVE_STPCPY
|
||||
|
||||
/* Define if you have the strcasecmp function. */
|
||||
#undef HAVE_STRCASECMP
|
||||
|
||||
/* Define if you have the strchr function. */
|
||||
#undef HAVE_STRCHR
|
||||
|
||||
/* Define if you have the strdup function. */
|
||||
#undef HAVE_STRDUP
|
||||
|
||||
/* Define if you have the strncasecmp function. */
|
||||
#undef HAVE_STRNCASECMP
|
||||
|
||||
/* Define if you have the strndup function. */
|
||||
#undef HAVE_STRNDUP
|
||||
|
||||
/* Define if you have the strftime function. */
|
||||
#undef HAVE_STRFTIME
|
||||
|
||||
/* Define if you have the strstr function. */
|
||||
#undef HAVE_STRSTR
|
||||
|
||||
/* Define if you have the strsep function. */
|
||||
#undef HAVE_STRSEP
|
||||
|
||||
/* Define if you have the strtod function. */
|
||||
#undef HAVE_STRTOD
|
||||
|
||||
/* Define if you have the valloc function. */
|
||||
#undef HAVE_VALLOC
|
||||
|
||||
/* Define if you have the vsyslog function. */
|
||||
#undef HAVE_VSYSLOG
|
||||
|
||||
/* Define if you have the snprintf function. */
|
||||
#undef HAVE_SNPRINTF
|
||||
|
||||
/* Ignore HAVE_USLEEP under Apollo Domain because the usleep()
|
||||
implementation in the Sys5.3 environment is broken. */
|
||||
#ifndef apollo
|
||||
/* Define if you have the usleep function. */
|
||||
# undef HAVE_USLEEP
|
||||
/* Define to 1 if on AIX 3.
|
||||
System headers sometimes define this.
|
||||
We just want to avoid a redefinition error message. */
|
||||
#ifndef _ALL_SOURCE
|
||||
# undef _ALL_SOURCE
|
||||
#endif
|
||||
|
||||
/* Define if you have the <argz.h> header file. */
|
||||
#undef HAVE_ARGZ_H
|
||||
/* Define to 1 if on MINIX. */
|
||||
#undef _MINIX
|
||||
|
||||
/* Define if you have the <fcntl.h> header file. */
|
||||
#undef HAVE_FCNTL_H
|
||||
/* Define to 2 if the system does not provide POSIX.1 features except with
|
||||
this defined. */
|
||||
#undef _POSIX_1_SOURCE
|
||||
|
||||
/* Define if you have the <libintl.h> header file. */
|
||||
#undef HAVE_LIBINTL_H
|
||||
/* Define to 1 if you need to in order for `stat' and other things to work. */
|
||||
#undef _POSIX_SOURCE
|
||||
|
||||
/* Define if you have the <libc.h> header file. */
|
||||
#undef HAVE_LIBC_H
|
||||
/* Define to empty if `const' does not conform to ANSI C. */
|
||||
#undef const
|
||||
|
||||
/* Define if you have the <limits.h> header file. */
|
||||
#undef HAVE_LIMITS_H
|
||||
/* Define as `__inline' if that's what the C compiler calls it, or to nothing
|
||||
if it is not supported. */
|
||||
#undef inline
|
||||
|
||||
/* Define if you have the <locale.h> header file. */
|
||||
#undef HAVE_LOCALE_H
|
||||
/* Define to `int' if <sys/types.h> does not define. */
|
||||
#undef pid_t
|
||||
|
||||
/* Define if you have the <malloc.h> header file. */
|
||||
#undef HAVE_MALLOC_H
|
||||
/* Define to `unsigned' if <sys/types.h> does not define. */
|
||||
#undef size_t
|
||||
|
||||
/* Define if you have the <nl_types.h> header file. */
|
||||
#undef HAVE_NL_TYPES_H
|
||||
/* Define to `long' if <sys/types.h> does not define. */
|
||||
#undef ssize_t
|
||||
|
||||
/* Define if you have the <string.h> header file. */
|
||||
#undef HAVE_STRING_H
|
||||
/* Define for OS/2 only */
|
||||
#undef strcasecmp
|
||||
|
||||
/* Define if you have the <sys/select.h> header file. */
|
||||
#undef HAVE_SYS_SELECT_H
|
||||
/* Define for OS/2 only */
|
||||
#undef strncasecmp
|
||||
|
||||
/* Define if you have the <sys/time.h> header file. */
|
||||
#undef HAVE_SYS_TIME_H
|
||||
/* Define to `unsigned char' if <sys/types.h> does not define. */
|
||||
#undef u_char
|
||||
|
||||
/* Define if you have the <os2.h> header file. */
|
||||
#undef HAVE_OS2_H
|
||||
/* Define to `unsigned int' if <sys/types.h> does not define. */
|
||||
#undef u_int
|
||||
|
||||
/* Define if you have EMX's sys/hw.h headers. */
|
||||
#undef HAVE_SYS_HW_H
|
||||
/* Define to `unsigned short' if <sys/types.h> does not define. */
|
||||
#undef u_int16_t
|
||||
|
||||
/* Define if you have sys/types.h. OS/2 wants them before select.h, etc. */
|
||||
#undef HAVE_SYS_TYPES_H
|
||||
/* Define to `unsigned int' if <sys/types.h> does not define. */
|
||||
#undef u_int32_t
|
||||
|
||||
/* Define if you have the <unistd.h> header file. */
|
||||
#undef HAVE_UNISTD_H
|
||||
/* Define to `unsigned char' if <sys/types.h> does not define. */
|
||||
#undef u_int8_t
|
||||
|
||||
/* Define if you have the <values.h> header file. */
|
||||
#undef HAVE_VALUES_H
|
||||
|
||||
/* Define if you have the i library (-li). */
|
||||
#undef HAVE_LIBI
|
||||
|
||||
/* Define if you have the intl library (-lintl). */
|
||||
#undef HAVE_LIBINTL
|
||||
|
||||
/* Define if you have the m library (-lm). */
|
||||
#undef HAVE_LIBM
|
||||
|
||||
/* Define if you have the GIMP header files and library. */
|
||||
#undef HAVE_LIBGIMP_GIMP_H
|
||||
|
||||
/* Define if you have the GIMPfeatures header file. */
|
||||
#undef HAVE_LIBGIMP_GIMPFEATURES_H
|
||||
|
||||
/* Define if you have libjpeg. */
|
||||
#undef HAVE_LIBJPEG
|
||||
|
||||
#ifndef HAVE_STRNCASECMP
|
||||
/* OS/2 needs this */
|
||||
# define strncasecmp(a, b, c) strnicmp(a, b, c)
|
||||
#endif
|
||||
|
||||
#if defined (__sun) && defined (__GNUC__)
|
||||
# define _POSIX_SOURCE
|
||||
# define __EXTENSIONS__
|
||||
#endif
|
||||
|
||||
#endif /* SANE_CONFIG_H */
|
||||
/* Define to `unsigned long' if <sys/types.h> does not define. */
|
||||
#undef u_long
|
||||
|
|
|
|||
|
|
@ -64,10 +64,14 @@
|
|||
|
||||
# ifdef HAVE_LIBGIMP_GIMPFEATURES_H
|
||||
# include <libgimp/gimpfeatures.h>
|
||||
# else
|
||||
# elif !defined(ENABLE_GIMP_1_3)
|
||||
# define GIMP_CHECK_VERSION(major, minor, micro) 0
|
||||
# endif /* HAVE_LIBGIMP_GIMPFEATURES_H */
|
||||
|
||||
#ifdef ENABLE_GIMP_1_3
|
||||
# define GIMP_HAVE_RESOLUTION_INFO
|
||||
#endif /* ENABLE_GIMP_1_3 */
|
||||
|
||||
# ifdef GIMP_CHECK_VERSION
|
||||
# if GIMP_CHECK_VERSION(1,1,25)
|
||||
/* ok, we have the new gimp interface */
|
||||
|
|
@ -76,8 +80,10 @@
|
|||
# include "xscanimage-gimp-1_0-compat.h"
|
||||
# endif
|
||||
# else
|
||||
# ifndef ENABLE_GIMP_1_3
|
||||
/* we have the old gimp interface and need the compatibility header file */
|
||||
# include "xscanimage-gimp-1_0-compat.h"
|
||||
# endif /* !ENABLE_GIMP_1_3 */
|
||||
# endif
|
||||
|
||||
static void query (void);
|
||||
|
|
@ -343,7 +349,11 @@ run (char *name, int nparams, GimpParam * param,
|
|||
int *nreturn_vals, GimpParam ** return_vals)
|
||||
{
|
||||
static GimpParam values[2];
|
||||
#ifdef ENABLE_GIMP_1_3
|
||||
GimpRunMode run_mode;
|
||||
#else
|
||||
GimpRunModeType run_mode;
|
||||
#endif /* ENABLE_GIMP_1_3 */
|
||||
char devname[1024];
|
||||
char *args[2];
|
||||
int nargs;
|
||||
|
|
@ -1848,7 +1858,13 @@ init (int argc, char **argv)
|
|||
#ifdef HAVE_LIBGIMP_GIMP_H
|
||||
gtk_rc_parse (gimp_gtkrc ());
|
||||
|
||||
# ifdef ENABLE_GIMP_1_3
|
||||
/* GIMP 1.3 defines gimp_use_xshm() as a macro always returning TRUE
|
||||
* (in the compat header) */
|
||||
gdk_set_use_xshm (TRUE);
|
||||
# else
|
||||
gdk_set_use_xshm (gimp_use_xshm ());
|
||||
# endif /* ENABLE_GIMP_1_3 */
|
||||
#endif
|
||||
|
||||
gsg_make_path (sizeof (filename), filename, 0, "sane-style", 0, ".rc");
|
||||
|
|
@ -2011,13 +2027,13 @@ main (int argc, char **argv)
|
|||
set_gimp_PLUG_IN_INFO(&PLUG_IN_INFO);
|
||||
# endif
|
||||
result = gimp_main (argc, argv);
|
||||
g_set_message_handler (old_print_func);
|
||||
g_set_error_handler(old_printerr_func);
|
||||
g_set_print_handler (old_print_func);
|
||||
g_set_printerr_handler (old_printerr_func);
|
||||
if (result)
|
||||
interface (argc, argv);
|
||||
}
|
||||
#else
|
||||
interface (argc, argv);
|
||||
#endif
|
||||
#endif /* HAVE_LIBGIMP_GIMP_H */
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue