зеркало из https://github.com/mozilla/gecko-dev.git
Bug 687766 part 1: Remove build-time dependency on libIDL. r=khuey
This commit is contained in:
Matheus Kerschbaum
Родитель
98b91d54fa
Коммит
b833cdd785
|
|
@ -4,7 +4,6 @@ dnl The contents of this file are under the Public Domain.
|
|||
dnl
|
||||
|
||||
builtin(include, build/autoconf/glib.m4)dnl
|
||||
builtin(include, build/autoconf/libIDL.m4)dnl
|
||||
builtin(include, build/autoconf/nspr.m4)dnl
|
||||
builtin(include, build/autoconf/nss.m4)dnl
|
||||
builtin(include, build/autoconf/pkg.m4)dnl
|
||||
|
|
|
|||
|
|
@ -1,194 +0,0 @@
|
|||
# Configure paths for LIBIDL
|
||||
|
||||
dnl AM_PATH_LIBIDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
|
||||
dnl Test for LIBIDL, and define LIBIDL_CFLAGS and LIBIDL_LIBS
|
||||
dnl
|
||||
AC_DEFUN([AM_PATH_LIBIDL],
|
||||
[dnl
|
||||
dnl Get the cflags and libraries from the libIDL-config script
|
||||
dnl
|
||||
AC_ARG_WITH(libIDL-prefix,[ --with-libIDL-prefix=PFX
|
||||
Prefix where libIDL is installed (optional)],
|
||||
libIDL_config_prefix="$withval", libIDL_config_prefix="")
|
||||
AC_ARG_WITH(libIDL-exec-prefix,[ --with-libIDL-exec-prefix=PFX
|
||||
Exec prefix where libIDL is installed (optional)],
|
||||
libIDL_config_exec_prefix="$withval", libIDL_config_exec_prefix="")
|
||||
AC_ARG_ENABLE(libIDLtest, [ --disable-libIDLtest Do not try to compile and run a test libIDL program],
|
||||
, enable_libIDLtest=yes)
|
||||
|
||||
if test x$libIDL_config_exec_prefix != x ; then
|
||||
libIDL_config_args="$libIDL_config_args --exec-prefix=$libIDL_config_exec_prefix"
|
||||
if test x${HOST_LIBIDL_CONFIG+set} != xset ; then
|
||||
HOST_LIBIDL_CONFIG=$libIDL_config_exec_prefix/bin/libIDL-config
|
||||
fi
|
||||
fi
|
||||
if test x$libIDL_config_prefix != x ; then
|
||||
libIDL_config_args="$libIDL_config_args --prefix=$libIDL_config_prefix"
|
||||
if test x${HOST_LIBIDL_CONFIG+set} != xset ; then
|
||||
HOST_LIBIDL_CONFIG=$libIDL_config_prefix/bin/libIDL-config
|
||||
fi
|
||||
fi
|
||||
|
||||
AM_PATH_GLIB(1.2.0)
|
||||
|
||||
dnl Force a version check to keep upgraded versions from being overridden by the cached value.
|
||||
unset ac_cv_path_LIBIDL_CONFIG
|
||||
|
||||
AC_PATH_PROG(HOST_LIBIDL_CONFIG, libIDL-config, no)
|
||||
min_libIDL_version=ifelse([$1], ,0.6.0,$1)
|
||||
AC_MSG_CHECKING(for libIDL - version >= $min_libIDL_version)
|
||||
no_libIDL=""
|
||||
if test "$HOST_LIBIDL_CONFIG" = "no" ; then
|
||||
no_libIDL=yes
|
||||
else
|
||||
HOST_LIBIDL_CFLAGS=`$HOST_LIBIDL_CONFIG $libIDL_config_args --cflags`
|
||||
HOST_LIBIDL_LIBS=`$HOST_LIBIDL_CONFIG $libIDL_config_args --libs`
|
||||
libIDL_config_major_version=`$HOST_LIBIDL_CONFIG $libIDL_config_args --version | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
|
||||
libIDL_config_minor_version=`$HOST_LIBIDL_CONFIG $libIDL_config_args --version | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
|
||||
libIDL_config_micro_version=`$HOST_LIBIDL_CONFIG $libIDL_config_args --version | \
|
||||
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
|
||||
if test "x$enable_libIDLtest" = "xyes" ; then
|
||||
ac_save_CFLAGS="$CFLAGS"
|
||||
ac_save_LIBS="$LIBS"
|
||||
CFLAGS="$CFLAGS $HOST_LIBIDL_CFLAGS"
|
||||
LIBS="$HOST_LIBIDL_LIBS $LIBS"
|
||||
dnl
|
||||
dnl Now check if the installed LIBIDL is sufficiently new.
|
||||
dnl
|
||||
rm -f conf.libIDLtest
|
||||
AC_TRY_RUN([
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <libIDL/IDL.h>
|
||||
|
||||
int
|
||||
main ()
|
||||
{
|
||||
int major, minor, micro;
|
||||
int libIDL_major_version;
|
||||
int libIDL_minor_version;
|
||||
int libIDL_micro_version;
|
||||
char *tmp_version;
|
||||
|
||||
system ("touch conf.libIDLtest");
|
||||
|
||||
/* HP/UX 9 (%@#!) writes to sscanf strings */
|
||||
tmp_version = g_strdup ("$min_libIDL_version");
|
||||
if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
|
||||
printf("%s, bad version string\n", "$min_libIDL_version");
|
||||
exit(1);
|
||||
}
|
||||
tmp_version = g_strdup (IDL_get_libver_string ());
|
||||
if (sscanf(tmp_version, "%d.%d.%d",
|
||||
&libIDL_major_version,
|
||||
&libIDL_minor_version,
|
||||
&libIDL_micro_version) != 3) {
|
||||
printf("%s, bad version string\n", tmp_version);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
if ((libIDL_major_version != $libIDL_config_major_version) ||
|
||||
(libIDL_minor_version != $libIDL_config_minor_version) ||
|
||||
(libIDL_micro_version != $libIDL_config_micro_version))
|
||||
{
|
||||
printf("\n*** 'libIDL-config --version' returned %d.%d.%d, but libIDL (%d.%d.%d)\n",
|
||||
$libIDL_config_major_version, $libIDL_config_minor_version, $libIDL_config_micro_version,
|
||||
libIDL_major_version, libIDL_minor_version, libIDL_micro_version);
|
||||
printf ("*** was found! If libIDL-config was correct, then it is best\n");
|
||||
printf ("*** to remove the old version of LIBIDL. You may also be able to fix the error\n");
|
||||
printf("*** by modifying your LD_LIBRARY_PATH environment variable, or by editing\n");
|
||||
printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
|
||||
printf("*** required on your system.\n");
|
||||
printf("*** If libIDL-config was wrong, set the environment variable LIBIDL_CONFIG\n");
|
||||
printf("*** to point to the correct copy of libIDL-config, and remove the file config.cache\n");
|
||||
printf("*** before re-running configure\n");
|
||||
}
|
||||
else if ((libIDL_major_version != LIBIDL_MAJOR_VERSION) ||
|
||||
(libIDL_minor_version != LIBIDL_MINOR_VERSION) ||
|
||||
(libIDL_micro_version != LIBIDL_MICRO_VERSION))
|
||||
{
|
||||
printf("\n*** libIDL header files (version %d.%d.%d) do not match\n",
|
||||
LIBIDL_MAJOR_VERSION, LIBIDL_MINOR_VERSION, LIBIDL_MICRO_VERSION);
|
||||
printf("*** library (version %d.%d.%d)\n",
|
||||
libIDL_major_version, libIDL_minor_version, libIDL_micro_version);
|
||||
}
|
||||
else
|
||||
{
|
||||
if ((libIDL_major_version > major) ||
|
||||
((libIDL_major_version == major) && (libIDL_minor_version > minor)) ||
|
||||
((libIDL_major_version == major) && (libIDL_minor_version == minor) && (libIDL_micro_version >= micro)))
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
printf("\n*** An old version of libIDL (%d.%d.%d) was found.\n",
|
||||
libIDL_major_version, libIDL_minor_version, libIDL_micro_version);
|
||||
printf("*** You need at least libIDL version %d.%d.%d.\n",
|
||||
major, minor, micro);
|
||||
printf("***\n");
|
||||
printf("*** If you have already installed a sufficiently new version, this error\n");
|
||||
printf("*** probably means that the wrong copy of the libIDL-config shell script is\n");
|
||||
printf("*** being found. The easiest way to fix this is to remove the old version\n");
|
||||
printf("*** of libIDL, but you can also set the LIBIDL_CONFIG environment to point to the\n");
|
||||
printf("*** correct copy of libIDL-config. (In this case, you will have to\n");
|
||||
printf("*** modify your LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf\n");
|
||||
printf("*** so that the correct libraries are found at run-time))\n");
|
||||
}
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
],, no_libIDL=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
|
||||
CFLAGS="$ac_save_CFLAGS"
|
||||
LIBS="$ac_save_LIBS"
|
||||
fi
|
||||
fi
|
||||
if test "x$no_libIDL" = x ; then
|
||||
AC_MSG_RESULT(yes)
|
||||
ifelse([$2], , :, [$2])
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
if test "$HOST_LIBIDL_CONFIG" = "no" ; then
|
||||
echo "*** The libIDL-config script installed by libIDL could not be found"
|
||||
echo "*** If libIDL was installed in PREFIX, make sure PREFIX/bin is in"
|
||||
echo "*** your path, or set the LIBIDL_CONFIG environment variable to the"
|
||||
echo "*** full path to libIDL-config."
|
||||
else
|
||||
if test -f conf.libIDLtest ; then
|
||||
:
|
||||
else
|
||||
echo "*** Could not run libIDL test program, checking why..."
|
||||
CFLAGS="$CFLAGS $HOST_LIBIDL_CFLAGS"
|
||||
LIBS="$LIBS $HOST_LIBIDL_LIBS"
|
||||
AC_TRY_LINK([
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <libIDL/IDL.h>
|
||||
], [ return IDL_get_libver_string ? 1 : 0; ],
|
||||
[ echo "*** The test program compiled, but did not run. This usually means"
|
||||
echo "*** that the run-time linker is not finding libIDL or finding the wrong"
|
||||
echo "*** version of LIBIDL. If it is not finding libIDL, 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 occurred. This usually means libIDL was incorrectly installed"
|
||||
echo "*** or that you have moved libIDL since it was installed. In the latter case, you"
|
||||
echo "*** may want to edit the libIDL-config script: $LIBIDL_CONFIG" ])
|
||||
CFLAGS="$ac_save_CFLAGS"
|
||||
LIBS="$ac_save_LIBS"
|
||||
fi
|
||||
fi
|
||||
HOST_LIBIDL_CFLAGS=""
|
||||
HOST_LIBIDL_LIBS=""
|
||||
ifelse([$3], , :, [$3])
|
||||
fi
|
||||
AC_SUBST(HOST_LIBIDL_CFLAGS)
|
||||
AC_SUBST(HOST_LIBIDL_LIBS)
|
||||
rm -f conf.libIDLtest
|
||||
])
|
||||
|
|
@ -400,10 +400,6 @@ HOST_LD = @HOST_LD@
|
|||
HOST_RANLIB = @HOST_RANLIB@
|
||||
HOST_BIN_SUFFIX = @HOST_BIN_SUFFIX@
|
||||
|
||||
HOST_LIBIDL_CONFIG = @HOST_LIBIDL_CONFIG@
|
||||
HOST_LIBIDL_CFLAGS = @HOST_LIBIDL_CFLAGS@
|
||||
HOST_LIBIDL_LIBS = @HOST_LIBIDL_LIBS@
|
||||
|
||||
HOST_OS_ARCH = @HOST_OS_ARCH@
|
||||
host_cpu = @host_cpu@
|
||||
host_vendor = @host_vendor@
|
||||
|
|
@ -578,9 +574,6 @@ MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@
|
|||
GLIB_CFLAGS = @GLIB_CFLAGS@
|
||||
GLIB_LIBS = @GLIB_LIBS@
|
||||
GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@
|
||||
LIBIDL_CFLAGS = @LIBIDL_CFLAGS@
|
||||
LIBIDL_LIBS = @LIBIDL_LIBS@
|
||||
STATIC_LIBIDL = @STATIC_LIBIDL@
|
||||
|
||||
MOZ_NATIVE_MAKEDEPEND = @SYSTEM_MAKEDEPEND@
|
||||
|
||||
|
|
|
|||
|
|
@ -308,7 +308,6 @@ hlink.h
|
|||
ia64/sys/inline.h
|
||||
Icons.h
|
||||
iconv.h
|
||||
IDL.h
|
||||
ieeefp.h
|
||||
ifaddrs.h
|
||||
image.h
|
||||
|
|
@ -404,7 +403,6 @@ libgnomevfs/gnome-vfs-mime-handlers.h
|
|||
libgnomevfs/gnome-vfs-mime-utils.h
|
||||
libgnomevfs/gnome-vfs-ops.h
|
||||
libgnomevfs/gnome-vfs-standard-callbacks.h
|
||||
libIDL/IDL.h
|
||||
lib$routines.h
|
||||
libnotify/notify.h
|
||||
limits
|
||||
|
|
|
|||
208
configure.in
208
configure.in
|
|
@ -116,7 +116,6 @@ NSS_VERSION=3
|
|||
dnl Set the minimum version of toolkit libs used by mozilla
|
||||
dnl ========================================================
|
||||
GLIB_VERSION=1.2.0
|
||||
LIBIDL_VERSION=0.6.3
|
||||
PERL_VERSION=5.006
|
||||
PYTHON_VERSION=2.5
|
||||
CAIRO_VERSION=1.10
|
||||
|
|
@ -7831,207 +7830,8 @@ dnl =
|
|||
dnl ========================================================
|
||||
MOZ_ARG_HEADER(Standalone module options (Not for building Mozilla))
|
||||
|
||||
dnl Check for GLib and libIDL.
|
||||
dnl Check for GLib.
|
||||
dnl ========================================================
|
||||
SKIP_IDL_CHECK="no"
|
||||
|
||||
if test -z "$COMPILE_ENVIRONMENT"; then
|
||||
SKIP_IDL_CHECK="yes"
|
||||
fi
|
||||
|
||||
dnl = Allow users to disable libIDL checking for standalone modules
|
||||
MOZ_ARG_WITHOUT_BOOL(libIDL,
|
||||
[ --without-libIDL Skip check for libIDL (standalone modules only)],
|
||||
SKIP_IDL_CHECK="yes")
|
||||
|
||||
if test -z "$CROSS_COMPILE"; then
|
||||
if test -z "$HOST_LIBIDL_CONFIG"; then
|
||||
HOST_LIBIDL_CONFIG="$LIBIDL_CONFIG"
|
||||
fi
|
||||
if test -z "$HOST_LIBIDL_PREFIX"; then
|
||||
HOST_LIBIDL_PREFIX="$LIBIDL_PREFIX"
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$SKIP_IDL_CHECK" = "no"
|
||||
then
|
||||
_LIBIDL_FOUND=
|
||||
case "$host" in
|
||||
*-mingw*)
|
||||
if test -n "$GLIB_PREFIX"; then
|
||||
_GLIB_PREFIX_DIR=`cd $GLIB_PREFIX && pwd -W`
|
||||
if test "$?" = "0"; then
|
||||
if test `echo ${PATH}: | grep -ic "$_GLIB_PREFIX_DIR/bin:"` = 0; then
|
||||
AC_MSG_ERROR([GLIB_PREFIX must be in your \$PATH.])
|
||||
fi
|
||||
else
|
||||
AC_MSG_ERROR([GLIB_PREFIX is set but "${GLIB_PREFIX}" is not a directory.])
|
||||
fi
|
||||
else
|
||||
_GLIB_PREFIX_DIR=$MOZ_TOOLS_DIR
|
||||
fi
|
||||
if test ! -f "${_GLIB_PREFIX_DIR}/include/glib.h"; then
|
||||
AC_MSG_ERROR([Cannot find $_GLIB_PREFIX_DIR/include/glib.h .])
|
||||
fi
|
||||
GLIB_CFLAGS="-I${_GLIB_PREFIX_DIR}/include"
|
||||
if test -f "${_GLIB_PREFIX_DIR}/lib/glib-1.2_s.lib"; then
|
||||
GLIB_LIBS="${_GLIB_PREFIX_DIR}/lib/glib-1.2_s.lib"
|
||||
elif test -f "${_GLIB_PREFIX_DIR}/lib/glib-1.2.lib"; then
|
||||
GLIB_LIBS="${_GLIB_PREFIX_DIR}/lib/glib-1.2.lib"
|
||||
else
|
||||
AC_MSG_ERROR([Cannot find $_GLIB_PREFIX_DIR/lib/glib-1.2.lib or $_GLIB_PREFIX_DIR/lib/glib-1.2_s.lib])
|
||||
fi
|
||||
|
||||
if test -n "$HOST_LIBIDL_PREFIX"; then
|
||||
_LIBIDL_PREFIX_DIR=`cd $HOST_LIBIDL_PREFIX && pwd -W`
|
||||
if test "$?" = "0"; then
|
||||
if test `echo ${PATH}: | grep -ic "$_LIBIDL_PREFIX_DIR/bin:"` = 0; then
|
||||
AC_MSG_ERROR([LIBIDL_PREFIX must be in your \$PATH.])
|
||||
fi
|
||||
else
|
||||
AC_MSG_ERROR([LIBIDL_PREFIX is set but "${LIBIDL_PREFIX}" is not a directory.])
|
||||
fi
|
||||
else
|
||||
_LIBIDL_PREFIX_DIR=$MOZ_TOOLS_DIR
|
||||
fi
|
||||
if test ! -f "${_LIBIDL_PREFIX_DIR}/include/libIDL/IDL.h"; then
|
||||
AC_MSG_ERROR([Cannot find $_LIBIDL_PREFIX_DIR/include/libIDL/IDL.h .])
|
||||
fi
|
||||
HOST_LIBIDL_CFLAGS="-I${_LIBIDL_PREFIX_DIR}/include ${GLIB_CFLAGS}"
|
||||
if test -f "${_LIBIDL_PREFIX_DIR}/lib/libidl-0.6_s.lib"; then
|
||||
HOST_LIBIDL_LIBS="${_LIBIDL_PREFIX_DIR}/lib/libidl-0.6_s.lib"
|
||||
STATIC_LIBIDL=1
|
||||
elif test -f "${_LIBIDL_PREFIX_DIR}/lib/libidl-0.6.lib"; then
|
||||
HOST_LIBIDL_LIBS="${_LIBIDL_PREFIX_DIR}/lib/libidl-0.6.lib"
|
||||
else
|
||||
AC_MSG_ERROR([Cannot find $_LIBIDL_PREFIX_DIR/lib/libidl-0.6.lib or $_LIBIDL_PREFIX_DIR/lib/libidl-0.6_s.lib])
|
||||
fi
|
||||
HOST_LIBIDL_LIBS="${HOST_LIBIDL_LIBS} ${GLIB_LIBS}"
|
||||
_LIBIDL_FOUND=1
|
||||
;;
|
||||
esac
|
||||
|
||||
if test -z "$_LIBIDL_FOUND"; then
|
||||
if test "$MACOS_SDK_DIR"; then
|
||||
dnl xpidl, and therefore libIDL, is only needed on the build host.
|
||||
dnl Don't build it against the SDK, as that causes problems.
|
||||
_MACSAVE_CFLAGS="$CFLAGS"
|
||||
_MACSAVE_LIBS="$LIBS"
|
||||
_MACSAVE_LDFLAGS="$LDFLAGS"
|
||||
_MACSAVE_NEXT_ROOT="$NEXT_ROOT"
|
||||
changequote(,)
|
||||
CFLAGS=`echo $CFLAGS|sed -E -e "s%((-I|-isystem )${MACOS_SDK_DIR}/usr/(include|lib/gcc)[^ ]*)|-F${MACOS_SDK_DIR}(/System)?/Library/Frameworks[^ ]*|-nostdinc[^ ]*|-isysroot ${MACOS_SDK_DIR}%%g"`
|
||||
LIBS=`echo $LIBS|sed -e "s?-L${MACOS_SDK_DIR}/usr/lib[^ ]*??g"`
|
||||
LDFLAGS=`echo $LDFLAGS|sed -e "s?-Wl,-syslibroot,${MACOS_SDK_DIR}??g"`
|
||||
changequote([,])
|
||||
unset NEXT_ROOT
|
||||
fi
|
||||
|
||||
PKG_CHECK_MODULES(HOST_LIBIDL, libIDL-2.0 >= 0.8.0 glib-2.0 gobject-2.0, _LIBIDL_FOUND=1,_LIBIDL_FOUND=)
|
||||
fi
|
||||
|
||||
dnl if no gtk/libIDL1 or gtk2/libIDL2 combination was found, fall back
|
||||
dnl to either libIDL1 or libIDL2.
|
||||
if test -z "$_LIBIDL_FOUND"; then
|
||||
AM_PATH_LIBIDL($LIBIDL_VERSION,_LIBIDL_FOUND=1)
|
||||
if test -z "$_LIBIDL_FOUND"; then
|
||||
PKG_CHECK_MODULES(HOST_LIBIDL, libIDL-2.0 >= 0.8.0,_LIBIDL_FOUND=1)
|
||||
fi
|
||||
fi
|
||||
dnl
|
||||
dnl If we don't have a libIDL config program & not cross-compiling,
|
||||
dnl look for orbit-config instead.
|
||||
dnl
|
||||
if test -z "$_LIBIDL_FOUND" -a -z "$CROSS_COMPILE"; then
|
||||
MOZ_PATH_PROGS(ORBIT_CONFIG, $ORBIT_CONFIG orbit-config)
|
||||
if test -n "$ORBIT_CONFIG"; then
|
||||
AC_MSG_CHECKING([for ORBit libIDL usability])
|
||||
_ORBIT_CFLAGS=`${ORBIT_CONFIG} client --cflags`
|
||||
_ORBIT_LIBS=`${ORBIT_CONFIG} client --libs`
|
||||
_ORBIT_INC_PATH=`${PERL} -e '{ for $f (@ARGV) { print "$f " if ($f =~ m/^-I/); } }' -- ${_ORBIT_CFLAGS}`
|
||||
_ORBIT_LIB_PATH=`${PERL} -e '{ for $f (@ARGV) { print "$f " if ($f =~ m/^-L/); } }' -- ${_ORBIT_LIBS}`
|
||||
HOST_LIBIDL_CFLAGS="$_ORBIT_INC_PATH"
|
||||
HOST_LIBIDL_LIBS="$_ORBIT_LIB_PATH -lIDL -lglib"
|
||||
HOST_LIBIDL_CONFIG=
|
||||
_SAVE_CFLAGS="$CFLAGS"
|
||||
_SAVE_LIBS="$LIBS"
|
||||
CFLAGS="$HOST_LIBIDL_CFLAGS $CFLAGS"
|
||||
LIBS="$HOST_LIBIDL_LIBS $LIBS"
|
||||
AC_TRY_RUN([
|
||||
#include <stdlib.h>
|
||||
#include <libIDL/IDL.h>
|
||||
int main() {
|
||||
char *s;
|
||||
s=strdup(IDL_get_libver_string());
|
||||
if(s==NULL) {
|
||||
exit(1);
|
||||
}
|
||||
exit(0);
|
||||
}
|
||||
], [_LIBIDL_FOUND=1
|
||||
result="yes"],
|
||||
[HOST_LIBIDL_CFLAGS=
|
||||
HOST_LIBIDL_LIBS=
|
||||
result="no"],
|
||||
[_LIBIDL_FOUND=1
|
||||
result="maybe"] )
|
||||
AC_MSG_RESULT($result)
|
||||
CFLAGS="$_SAVE_CFLAGS"
|
||||
LIBS="$_SAVE_LIBS"
|
||||
fi
|
||||
fi
|
||||
if test -z "$_LIBIDL_FOUND"; then
|
||||
AC_MSG_ERROR([libIDL not found.
|
||||
libIDL $LIBIDL_VERSION or higher is required.])
|
||||
fi
|
||||
if test "$MACOS_SDK_DIR"; then
|
||||
CFLAGS="$_MACSAVE_CFLAGS"
|
||||
LIBS="$_MACSAVE_LIBS"
|
||||
LDFLAGS="$_MACSAVE_LDFLAGS"
|
||||
if test -n "$_MACSAVE_NEXT_ROOT" ; then
|
||||
export NEXT_ROOT="$_MACSAVE_NEXT_ROOT"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
if test -n "$CROSS_COMPILE"; then
|
||||
case "$target" in
|
||||
*-mingw*)
|
||||
if test -n "$GLIB_PREFIX"; then
|
||||
GLIB_CFLAGS="-I${GLIB_PREFIX}/include"
|
||||
if test -f "${GLIB_PREFIX}/lib/glib-1.2_s.lib"; then
|
||||
GLIB_LIBS="${GLIB_PREFIX}/lib/glib-1.2_s.lib"
|
||||
elif test -f "${GLIB_PREFIX}/lib/glib-1.2.lib"; then
|
||||
GLIB_LIBS="${GLIB_PREFIX}/lib/glib-1.2.lib"
|
||||
else
|
||||
AC_MSG_ERROR([Cannot find $GLIB_PREFIX/lib/glib-1.2.lib or $GLIB_PREFIX/lib/glib-1.2_s.lib])
|
||||
fi
|
||||
fi
|
||||
|
||||
if test -n "$LIBIDL_PREFIX"; then
|
||||
LIBIDL_CFLAGS="-I${LIBIDL_PREFIX}/include ${GLIB_CFLAGS}"
|
||||
if test -f "${LIBIDL_PREFIX}/lib/libIDL-0.6_s.lib"; then
|
||||
LIBIDL_LIBS="${LIBIDL_PREFIX}/lib/libIDL-0.6_s.lib"
|
||||
STATIC_LIBIDL=1
|
||||
elif test -f "${LIBIDL_PREFIX}/lib/libIDL-0.6.lib"; then
|
||||
LIBIDL_LIBS="${LIBIDL_PREFIX}/lib/libIDL-0.6.lib"
|
||||
else
|
||||
AC_MSG_ERROR([Cannot find $LIBIDL_PREFIX/lib/libIDL-0.6.lib or $LIBIDL_PREFIX/lib/libIDL-0.6_s.lib])
|
||||
fi
|
||||
fi
|
||||
LIBIDL_LIBS="${LIBIDL_LIBS} ${GLIB_LIBS}"
|
||||
;;
|
||||
*)
|
||||
if test -n "LIBIDL_CONFIG" -a "LIBIDL_CONFIG" != "no"; then
|
||||
LIBIDL_CFLAGS=`${LIBIDL_CONFIG} --cflags`
|
||||
LIBIDL_LIBS=`${LIBIDL_CONFIG} --libs`
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
else
|
||||
LIBIDL_CFLAGS="$HOST_LIBIDL_CFLAGS"
|
||||
LIBIDL_LIBS="$HOST_LIBIDL_LIBS"
|
||||
fi
|
||||
|
||||
if test -z "$SKIP_PATH_CHECKS"; then
|
||||
if test -z "${GLIB_CFLAGS}" -o -z "${GLIB_LIBS}" ; then
|
||||
|
|
@ -8050,15 +7850,9 @@ if test -z "${GLIB_GMODULE_LIBS}" \
|
|||
GLIB_GMODULE_LIBS=`$GLIB_CONFIG gmodule --libs`
|
||||
fi
|
||||
|
||||
AC_SUBST(LIBIDL_CFLAGS)
|
||||
AC_SUBST(LIBIDL_LIBS)
|
||||
AC_SUBST(STATIC_LIBIDL)
|
||||
AC_SUBST(GLIB_CFLAGS)
|
||||
AC_SUBST(GLIB_LIBS)
|
||||
AC_SUBST(GLIB_GMODULE_LIBS)
|
||||
AC_SUBST(HOST_LIBIDL_CONFIG)
|
||||
AC_SUBST(HOST_LIBIDL_CFLAGS)
|
||||
AC_SUBST(HOST_LIBIDL_LIBS)
|
||||
|
||||
dnl ========================================================
|
||||
dnl Check for cairo
|
||||
|
|
|
|||
|
|
@ -308,7 +308,6 @@ hlink.h
|
|||
ia64/sys/inline.h
|
||||
Icons.h
|
||||
iconv.h
|
||||
IDL.h
|
||||
ieeefp.h
|
||||
ifaddrs.h
|
||||
image.h
|
||||
|
|
@ -404,7 +403,6 @@ libgnomevfs/gnome-vfs-mime-handlers.h
|
|||
libgnomevfs/gnome-vfs-mime-utils.h
|
||||
libgnomevfs/gnome-vfs-ops.h
|
||||
libgnomevfs/gnome-vfs-standard-callbacks.h
|
||||
libIDL/IDL.h
|
||||
lib$routines.h
|
||||
libnotify/notify.h
|
||||
limits
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче