← Back to branch summary

~cjwatson/ubiquity/new-partitioner

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Colin Watson
  • Date: 2006-12-12 16:07:31 UTC
  • mto: This revision was merged to the branch mainline in revision 1490.
  • Revision ID: colin.watson@canonical.com-20061212160731-7078c970ca40164a
* Configure and build the desktop, pixmaps, and po subdirectories even if
  UBIQUITY_NO_GTK is set.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
26
26
AM_PATH_PYTHON([2.4])
27
27
AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR([could not find Python headers])])
28
28
 
29
 
PKG_CHECK_MODULES(PYGTK, [gtk+-2.0 >= $GTK_REQUIRED pygtk-2.0])
30
 
AC_SUBST(PYGTK_CFLAGS)
31
 
AC_SUBST(PYGTK_LIBS)
32
 
AC_PATH_PROG(PYGTK_CODEGEN, [pygtk-codegen-2.0], [no])
33
 
if test "x$PYGTK_CODEGEN" = xno; then
34
 
  AC_MSG_ERROR([could not find pygtk-codegen-2.0 script])
35
 
fi
36
 
 
37
 
AC_MSG_CHECKING([for pygtk defs])
38
 
PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
39
 
AC_SUBST(PYGTK_DEFSDIR)
40
 
AC_MSG_RESULT($PYGTK_DEFSDIR)
41
 
 
42
 
dnl glib-genmarshal
43
 
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
44
 
 
45
 
AM_PATH_GTK_2_0([$GTK_REQUIRED])
46
 
 
47
 
dnl =====================================================
48
 
dnl Check for Module versions
49
 
dnl =====================================================
50
 
 
51
 
PKG_CHECK_MODULES(UBIQUITY_DEPENDS,[
52
 
                           gtk+-2.0 >= $GTK_REQUIRED
53
 
                           libart-2.0
54
 
                           ])
55
 
 
56
 
dnl =====================================================
57
 
dnl END: Check for Module versions
58
 
dnl =====================================================
59
 
 
60
 
dnl ========================================================
61
 
dnl Set PIXMAPS_DIR 
62
 
dnl ========================================================
 
29
if test "x$UBIQUITY_NO_GTK" = x; then
 
30
  PKG_CHECK_MODULES(PYGTK, [gtk+-2.0 >= $GTK_REQUIRED pygtk-2.0])
 
31
  AC_SUBST(PYGTK_CFLAGS)
 
32
  AC_SUBST(PYGTK_LIBS)
 
33
  AC_PATH_PROG(PYGTK_CODEGEN, [pygtk-codegen-2.0], [no])
 
34
else
 
35
  AC_SUBST(PYGTK_CFLAGS, [])
 
36
  AC_SUBST(PYGTK_LIBS, [])
 
37
  AC_SUBST(PYGTK_CODEGEN, [no])
 
38
fi
 
39
 
 
40
AM_CONDITIONAL([PYGTK_CODEGEN], [test "x$PYGTK_CODEGEN" != xno])
 
41
if test "x$PYGTK_CODEGEN" != xno; then
 
42
  AC_MSG_CHECKING([for pygtk defs])
 
43
  PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
 
44
  AC_SUBST(PYGTK_DEFSDIR)
 
45
  AC_MSG_RESULT($PYGTK_DEFSDIR)
 
46
 
 
47
  AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 
48
 
 
49
  AM_PATH_GTK_2_0([$GTK_REQUIRED])
 
50
 
 
51
  PKG_CHECK_MODULES(UBIQUITY_DEPENDS,[
 
52
        gtk+-2.0 >= $GTK_REQUIRED
 
53
        libart-2.0
 
54
        ])
 
55
 
 
56
  AC_CONFIG_FILES(
 
57
        src/Makefile
 
58
        src/cut-and-paste/Makefile
 
59
        src/cut-and-paste/e-map/Makefile
 
60
        )
 
61
fi
63
62
 
64
63
AC_DEFINE_UNQUOTED(PIXMAPS_DIR, "${datadir}/${PACKAGE}/pixmaps", [pixmaps directory])
65
64
pixmapsdir="${datadir}/${PACKAGE}/pixmaps"
66
 
 
67
 
AC_SUBST(scriptsdir)
68
65
AC_SUBST(pixmapsdir)
69
66
 
70
 
dnl ==============================================================
71
 
dnl END: Set PIXMAPS_DIR 
72
 
dnl ==============================================================
73
 
 
74
 
AC_OUTPUT([
75
 
Makefile
76
 
desktop/Makefile
77
 
pixmaps/Makefile
78
 
po/Makefile.in
79
 
src/Makefile
80
 
src/cut-and-paste/Makefile
81
 
src/cut-and-paste/e-map/Makefile
82
 
])
 
67
AC_CONFIG_FILES(
 
68
        Makefile
 
69
        desktop/Makefile
 
70
        pixmaps/Makefile
 
71
        po/Makefile.in
 
72
        )
 
73
AC_OUTPUT