diff options
| author | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2005-03-01 10:43:41 +0000 |
|---|---|---|
| committer | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2005-03-01 10:43:41 +0000 |
| commit | 1ae3f0de4c075b75f8899c76a59073c36daa1058 (patch) | |
| tree | 1520bee3a482fba80f75ee5a447ae9df5e634c16 | |
| parent | 9d1f3c573b52d3ae4932c5304e99f436835adce4 (diff) | |
configure.in: check for GLib/GTK version (>= 2.4.0).
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@137 ee746299-78ed-0310-b773-934348b2243d
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ChangeLog.ja | 4 | ||||
| -rw-r--r-- | configure.in | 37 |
3 files changed, 26 insertions, 19 deletions
@@ -1,5 +1,9 @@ 2005-03-01 + * configure.in: check for GLib/GTK version (>= 2.4.0). + +2005-03-01 + * src/gtkutils.[ch]: removed non-used code. 2005-03-01 diff --git a/ChangeLog.ja b/ChangeLog.ja index 6016f2f9..47a52104 100644 --- a/ChangeLog.ja +++ b/ChangeLog.ja @@ -1,5 +1,9 @@ 2005-03-01 + * configure.in: GLib/GTK のバージョン(>= 2.4.0)をチェック。 + +2005-03-01 + * src/gtkutils.[ch]: 未使用のコードを削除。 2005-03-01 diff --git a/configure.in b/configure.in index c239d9dc..a6a797bb 100644 --- a/configure.in +++ b/configure.in @@ -59,16 +59,28 @@ case "$target" in ;; esac +dnl Checks for libraries. +PKG_CHECK_MODULES(GTK, \ + [ glib-2.0 gthread-2.0 gdk-pixbuf-2.0 gtk+-2.0 ], , + [ AC_MSG_ERROR(Test for GTK+-2.0 failed. See the file 'INSTALL' for help.) ]) + +AM_PATH_GLIB_2_0(2.4.0,, AC_MSG_ERROR(Test for GLib failed. See the 'INSTALL' for help.)) + +AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) + +AM_PATH_GTK_2_0(2.4.0,, AC_MSG_ERROR(Test for Gtk failed. See the 'INSTALL' for help.)) + +dnl --disable-deprecated switch for GTK2 purification +AC_ARG_ENABLE(deprecated, [ --disable-deprecated Disable deprecated GTK functions. ], + [GTK_CFLAGS="$GTK_CFLAGS -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"], []) + +AC_SUBST(GTK_CFLAGS) +AC_SUBST(GTK_LIBS) + dnl checks for iconv AM_ICONV -dnl -dnl Check for bind_textdomain_codeset, including -lintl if GLib brings it in. -dnl -syl_save_LIBS=$LIBS -LIBS="$LIBS $GTK_LIBS" AC_CHECK_FUNCS(bind_textdomain_codeset) -LIBS=$syl_save_LIBS dnl for gettext ALL_LINGUAS="bg cs da de el es et fr gl hr hu it ja ko nl pl pt_BR ro ru sk sl sr sv tr uk zh_CN zh_TW.Big5" @@ -87,19 +99,6 @@ AC_SUBST(manualdir) faqdir='${prefix}/${DATADIRNAME}/${PACKAGE}/faq' AC_SUBST(faqdir) -dnl Checks for libraries. -PKG_CHECK_MODULES(GTK, \ - [ glib-2.0 gthread-2.0 gdk-pixbuf-2.0 gtk+-2.0 ], , - [ AC_MSG_ERROR(Test for GTK+-2.0 failed. See the file 'INSTALL' for help.) ]) -AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) - -dnl --disable-deprecated switch for GTK2 purification -AC_ARG_ENABLE(deprecated, [ --disable-deprecated Disable deprecated GTK functions. ], - [GTK_CFLAGS="$GTK_CFLAGS -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"], []) - -AC_SUBST(GTK_CFLAGS) -AC_SUBST(GTK_LIBS) - dnl Check for built-in image view support AC_ARG_ENABLE(gdk-pixbuf, [ --disable-gdk-pixbuf Do not use gdk-pixbuf], |