Commit f6adf1d5 authored by Johannes Schmid's avatar Johannes Schmid

fixed #344678

parent fe4f3bbb
2006-06-13 Johannes Schmid <jhs@cvs.gnome.org>
* configure.in: Fixed configure script (#344678)
2006-06-01 Johannes Schmid <jhs@cvs.gnome.org>
* autogen.sh:
......
......@@ -33,11 +33,12 @@ AC_SUBST(GDL_VERSION)
SNAPSHOT=0_`date +%Y%m%d_%H%M%S`_cvs
AC_SUBST(SNAPSHOT)
GTK_REQUIRED=2.3.0
GNOME_REQUIRED=2.5.0
GTK_REQUIRED=2.4.0
GNOME_REQUIRED=2.6.0
BONOBOUI_REQUIRED=2.2.0
XML_REQUIRED=2.2.8
LIBGLADE_REQUIRED=2.0.0
GNOME_VFS_REQUIRED=2.6.0
AC_SUBST(GTK_REQUIRED)
AC_SUBST(GNOME_REQUIRED)
......@@ -56,10 +57,10 @@ AC_TYPE_SIGNAL
AC_PROG_CXX
AC_STDC_HEADERS
AM_SANITY_CHECK
AC_DISABLE_STATIC
AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL
AC_DISABLE_STATIC
AC_LIBTOOL_WIN32_DLL
AC_PROG_LIBTOOL
dnl ***************
......@@ -93,7 +94,7 @@ AC_ARG_ENABLE(gnome,
user_disabled_gnome=1
fi ],
[ user_disabled_gnome=0 ])
DEPRECATED_FLAGS=""
AC_MSG_CHECKING(if gnome is disabled)
if test "$user_disabled_gnome" = 1; then
......@@ -109,39 +110,37 @@ else
[gnome="no"])
AC_SUBST(GNOME_CFLAGS)
AC_SUBST(GNOME_LIBS)
if test x$MAINT = x; then
DEPRECATED_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED"
# TODO specify flags per hand, no gnome-common on win32
#GNOME_COMPILE_WARNINGS(error)
#else
# TODO GNOME_COMPILE_WARNINGS(maximum)
fi
AC_MSG_RESULT([$gnome])
fi
AC_SUBST(DEPRECATED_FLAGS)
AM_CONDITIONAL(HAVE_GNOME, [test x$gnome = xyes])
AC_MSG_CHECKING([for native Win32])
case "$host" in
*-*-mingw*)
native_win32=yes
;;
*)
native_win32=no
;;
esac
AC_MSG_RESULT([$native_win32])
AM_CONDITIONAL(OS_WIN32, test "x$native_win32" = "xyes")
EXTRA_CPPFLAGS=
EXTRA_LDFLAGS=
if test "x$native_win32" = "xyes"; then
EXTRA_CPPFLAGS="-mms-bitfields"
EXTRA_LDFLAGS="-no-undefined -Wl,--kill-at -Wl,--export-all-symbols"
fi
AC_SUBST(EXTRA_CPPFLAGS)
AC_SUBST(EXTRA_LDFLAGS)
if test x$MAINT = x; then
DEPRECATED_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED"
AC_SUBST(DEPRECATED_FLAGS)
fi
AC_MSG_CHECKING([for native Win32])
case "$host" in
*-*-mingw*)
native_win32=yes
;;
*)
native_win32=no
;;
esac
AC_MSG_RESULT([$native_win32])
AM_CONDITIONAL(OS_WIN32, test "x$native_win32" = "xyes")
EXTRA_CPPFLAGS=
EXTRA_LDFLAGS=
if test "x$native_win32" = "xyes"; then
EXTRA_CPPFLAGS="-mms-bitfields"
EXTRA_LDFLAGS="-no-undefined -Wl,--kill-at -Wl,--export-all-symbols"
fi
AC_SUBST(EXTRA_CPPFLAGS)
AC_SUBST(EXTRA_LDFLAGS)
# marshal and enum generators
GLIB_GENMARSHAL="`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`"
......
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