configure.in use automake conditionals for subdirectories so that they
2003-06-09 Sven Neumann <sven@gimp.org> * configure.in * plug-ins/Makefile.am: use automake conditionals for subdirectories so that they will always be included in the tarball.
This commit is contained in:
Sven Neumann
Sven Neumann
parent
58b975a4f2
commit
67dbecc926
3 changed files with 92 additions and 68 deletions
|
|
@ -1,3 +1,10 @@
|
|||
2003-06-09 Sven Neumann <sven@gimp.org>
|
||||
|
||||
* configure.in
|
||||
* plug-ins/Makefile.am: use automake conditionals for
|
||||
subdirectories so that they will always be included in the
|
||||
tarball.
|
||||
|
||||
2003-06-09 Sven Neumann <sven@gimp.org>
|
||||
|
||||
* app/paint/gimpsmudge.c (gimp_smudge_start): now that
|
||||
|
|
|
|||
115
configure.in
115
configure.in
|
|
@ -584,13 +584,13 @@ if test "$gdk_target" = x11; then
|
|||
AC_CHECK_LIB(Xmu, XmuClientWindow,
|
||||
[AC_CHECK_HEADER(X11/Xmu/WinUtil.h,
|
||||
GIMP_REMOTE='gimp-remote-1.3';
|
||||
WEBBROWSER='webbrowser';
|
||||
have_libxmu=yes
|
||||
LIBXMU="$X_LIBS $X_PRE_LIBS -lX11 -lXmu -lXt",
|
||||
[AC_MSG_WARN(*** webbrowser plug-in and gimp-remote will not be built (XMU header file not found) ***)])],
|
||||
[AC_CHECK_LIB(Xmu, XmuUpdateMapHints,
|
||||
[AC_CHECK_HEADER(X11/Xmu/WinUtil.h,
|
||||
GIMP_REMOTE='gimp-remote-1.3';
|
||||
WEBBROWSER='webbrowser';
|
||||
have_libxmu=yes
|
||||
LIBXMU="$X_LIBS $X_PRE_LIBS -lX11 -lXmu -lXt",
|
||||
[AC_MSG_WARN(*** webbrowser plug-in and gimp-remote will not be built (XMU header file not found) ***)])],
|
||||
AC_MSG_WARN(*** webbrowser plug-in and gimp-remote will not be built (XMU library not found) ***), -lXt)], -lXt)
|
||||
|
|
@ -600,9 +600,12 @@ if test "$gdk_target" = x11; then
|
|||
fi
|
||||
|
||||
AC_SUBST(LIBXMU)
|
||||
AC_SUBST(WEBBROWSER)
|
||||
AC_SUBST(GIMP_REMOTE)
|
||||
|
||||
## webbrowser has ifdefs for Win32
|
||||
AM_CONDITIONAL(BUILD_WEBBROWSER,
|
||||
test x"$have_libxmu" = xyes || test x"$os_win32" = xyes)
|
||||
|
||||
|
||||
###################
|
||||
# Check for libtiff
|
||||
|
|
@ -659,7 +662,7 @@ AC_ARG_WITH(libjpeg, [ --without-libjpeg build without JPEG support])
|
|||
jpeg_ok=no)
|
||||
AC_MSG_RESULT($jpeg_ok)
|
||||
if test "$jpeg_ok" = yes; then
|
||||
JPEG='jpeg'; XJT='xjt'; LIBJPEG='-ljpeg'
|
||||
JPEG='jpeg'; LIBJPEG='-ljpeg'
|
||||
AC_CHECK_LIB(jpeg, jpeg_simple_progression,
|
||||
AC_DEFINE(HAVE_PROGRESSIVE_JPEG, 1,
|
||||
[Define to 1 if jpeglib supports progressive JPEG.]),
|
||||
|
|
@ -680,6 +683,10 @@ AC_ARG_WITH(libjpeg, [ --without-libjpeg build without JPEG support])
|
|||
AC_SUBST(JPEG)
|
||||
AC_SUBST(LIBJPEG)
|
||||
|
||||
## xjt does build, but it is more confusing than useful on Win32,
|
||||
## as it wants to run tar, mv and bzip2, which seldom are available
|
||||
AM_CONDITIONAL(BUILD_XJT, test x$jpeg_ok = xyes && test x"$os_win32" = xno)
|
||||
|
||||
|
||||
################
|
||||
# Check for libz
|
||||
|
|
@ -802,11 +809,47 @@ AC_SUBST(LIBXPM)
|
|||
####################
|
||||
|
||||
PKG_CHECK_MODULES(GTKHTML2, libgtkhtml-2.0 >= $GTKHTML2_REQUIRED_VERSION,
|
||||
HELPBROWSER=helpbrowser,
|
||||
have_gtkhtml2=yes,
|
||||
AC_MSG_WARN([*** Help browser plug-in will not be built (GtkHtml2 not found) ***]))
|
||||
AC_SUBST(GTKHTML2_CFLAGS)
|
||||
AC_SUBST(GTKHTML2_LIBS)
|
||||
AC_SUBST(HELPBROWSER)
|
||||
AM_CONDITIONAL(BUILD_HELPBROWSER, test x$have_gtkhtml2 = xyes)
|
||||
|
||||
|
||||
######################
|
||||
# Check for gimp-print
|
||||
######################
|
||||
|
||||
AC_ARG_ENABLE(print, [ --disable-print build without print support (requires libgimpprint)])
|
||||
if test "x$enable_print" != "xno"; then
|
||||
AC_PATH_PROG(PRINT_CONFIG, gimpprint-config, no)
|
||||
if test "x$PRINT_CONFIG" != "xno"; then
|
||||
AC_MSG_CHECKING(for gimpprint >= $GIMPPRINT_REQUIRED_VERSION)
|
||||
print_version=`$PRINT_CONFIG --version`
|
||||
if expr $print_version \>= $GIMPPRINT_REQUIRED_VERSION >/dev/null; then
|
||||
AC_MSG_RESULT([yes (version $print_version)])
|
||||
have_gimp_print=yes
|
||||
PRINT_LIBS=`$PRINT_CONFIG --libs`
|
||||
PRINT_CFLAGS=`$PRINT_CONFIG --cflags`
|
||||
else
|
||||
AC_MSG_WARN([
|
||||
*** libgimpprint version $print_version is too old.
|
||||
*** You need at least version $GIMPPRINT_REQUIRED_VERSION.])
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
if test x$enable_print != xno && test x$have_gimp_print != xyes; then
|
||||
AC_MSG_ERROR([
|
||||
*** Check for libgimpprint failed. You can download it from
|
||||
*** http://gimp-print.sourceforge.net/ or you can build without it by passing
|
||||
*** --disable-print to configure (but you won't be able to print then).])
|
||||
fi
|
||||
|
||||
AC_SUBST(PRINT_LIBS)
|
||||
AC_SUBST(PRINT_CFLAGS)
|
||||
AM_CONDITIONAL(BUILD_PRINT,
|
||||
test x$enable_print != xno && test x$have_gimp_print = xyes)
|
||||
|
||||
|
||||
####################
|
||||
|
|
@ -828,46 +871,13 @@ if test "x$SENDMAIL" != "x"; then
|
|||
fi
|
||||
|
||||
|
||||
######################
|
||||
# Check for gimp-print
|
||||
######################
|
||||
|
||||
AC_ARG_ENABLE(print, [ --disable-print build without print support (requires libgimpprint)])
|
||||
if test "x$enable_print" != "xno"; then
|
||||
AC_PATH_PROG(PRINT_CONFIG, gimpprint-config, no)
|
||||
if test "x$PRINT_CONFIG" != "xno"; then
|
||||
AC_MSG_CHECKING(for gimpprint >= $GIMPPRINT_REQUIRED_VERSION)
|
||||
print_version=`$PRINT_CONFIG --version`
|
||||
if expr $print_version \>= $GIMPPRINT_REQUIRED_VERSION >/dev/null; then
|
||||
AC_MSG_RESULT([yes (version $print_version)])
|
||||
PRINT=print
|
||||
PRINT_LIBS=`$PRINT_CONFIG --libs`
|
||||
PRINT_CFLAGS=`$PRINT_CONFIG --cflags`
|
||||
else
|
||||
AC_MSG_WARN([
|
||||
*** libgimpprint version $print_version is too old.
|
||||
*** You need at least version $GIMPPRINT_REQUIRED_VERSION.])
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
if test x$enable_print != xno && test -z "$PRINT"; then
|
||||
AC_MSG_ERROR([
|
||||
*** Check for libgimpprint failed. You can download it from
|
||||
*** http://gimp-print.sourceforge.net/ or you can build without it by passing
|
||||
*** --disable-print to configure (but you won't be able to print then).])
|
||||
fi
|
||||
|
||||
AC_SUBST(PRINT)
|
||||
AC_SUBST(PRINT_LIBS)
|
||||
AC_SUBST(PRINT_CFLAGS)
|
||||
|
||||
|
||||
################
|
||||
# Check for perl
|
||||
################
|
||||
|
||||
AC_ARG_WITH(pdbgen, [ --with-pdbgen use 'pdbgen' code generation tool],,with_pdbgen=$enable_maintainer_mode)
|
||||
AC_ARG_WITH(pdbgen,
|
||||
[ --with-pdbgen use 'pdbgen' code generation tool],,
|
||||
with_pdbgen=$enable_maintainer_mode)
|
||||
|
||||
if test "x$with_pdbgen" = xyes ; then
|
||||
AC_PATH_PROGS(PERL,perl5 perl perl5.005 perl5.004,perl)
|
||||
|
|
@ -883,7 +893,8 @@ AM_CONDITIONAL(WITH_AUTHORSGEN, test x$enable_maintainer_mode = xyes)
|
|||
|
||||
dnl Pygimp configure stuff ...
|
||||
AC_ARG_ENABLE(python,
|
||||
AC_HELP_STRING([--enable-python], [build python extension [by default disabled]]),,
|
||||
AC_HELP_STRING([--enable-python],
|
||||
[build python extension [by default disabled]]),,
|
||||
[enable_python=no])
|
||||
|
||||
|
||||
|
|
@ -904,15 +915,8 @@ AM_CONDITIONAL(BUILD_PYTHON, test "x$enable_python" != xno)
|
|||
###########################################################
|
||||
|
||||
if test x"$os_win32" = xyes; then
|
||||
TWAIN='twain'
|
||||
WINCLIPBOARD='winclipboard'
|
||||
WINPRINT='winprint'
|
||||
WINSNAP='winsnap'
|
||||
dnl webbrowser has ifdefs for Win32
|
||||
WEBBROWSER='webbrowser'
|
||||
dnl xjt does build, but it isn't more confusing than useful on Win32,
|
||||
dnl as it wants to run tar, mv and bzip2, which seldom are available
|
||||
XJT=''
|
||||
else
|
||||
BZ2='bz2'
|
||||
MAIL='mail'
|
||||
|
|
@ -923,12 +927,10 @@ fi
|
|||
AC_SUBST(BZ2)
|
||||
AC_SUBST(MAIL)
|
||||
AC_SUBST(SCREENSHOT)
|
||||
AC_SUBST(TWAIN)
|
||||
AC_SUBST(URL)
|
||||
AC_SUBST(WINCLIPBOARD)
|
||||
AC_SUBST(WINPRINT)
|
||||
AC_SUBST(WINSNAP)
|
||||
AC_SUBST(XJT)
|
||||
|
||||
|
||||
#################################################################
|
||||
# Determine where to install the GNOME2 desktop & mime info files
|
||||
|
|
@ -1039,13 +1041,6 @@ if test "$INSTALL" = "$ac_install_sh"; then
|
|||
fi
|
||||
AC_SUBST(GIMPINSTALL)
|
||||
|
||||
dnl FIXME: Do we need to do this?
|
||||
if test -n "$DISTMAKE"; then
|
||||
TIFF=tiff JPEG=jpeg PNG=png MNG=mng AA=aa PRINT=print
|
||||
TWAIN=twain WEBBROWSER=webbrowser WINSNAP=winsnap HELPBROWSER=helpbrowser
|
||||
XJT=xjt XPM=xpm
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(STATICLIBS, test x$enable_static = xyes)
|
||||
|
||||
dnl a tuned version of glib-mkenums
|
||||
|
|
|
|||
|
|
@ -3,10 +3,33 @@
|
|||
EXTRA_DIST = \
|
||||
makefile.msc
|
||||
|
||||
if BUILD_PYTHON
|
||||
pygimp=pygimp
|
||||
if BUILD_PRINT
|
||||
print = print
|
||||
endif
|
||||
|
||||
if BUILD_PYTHON
|
||||
pygimp = pygimp
|
||||
endif
|
||||
|
||||
if BUILD_HELPBROWSER
|
||||
helpbrowser = helpbrowser
|
||||
endif
|
||||
|
||||
if BUILD_WEBBROWSER
|
||||
webbrowser = webbrowser
|
||||
endif
|
||||
|
||||
if BUILD_XJT
|
||||
xjt = xjt
|
||||
endif
|
||||
|
||||
if OS_WIN32
|
||||
win32dirs = \
|
||||
twain \
|
||||
winsnap
|
||||
endif
|
||||
|
||||
|
||||
SUBDIRS = \
|
||||
libgck \
|
||||
dbbrowser \
|
||||
|
|
@ -23,19 +46,18 @@ SUBDIRS = \
|
|||
gflare \
|
||||
gfli \
|
||||
gimpressionist \
|
||||
$(HELPBROWSER) \
|
||||
$(helpbrowser) \
|
||||
ifscompose \
|
||||
imagemap \
|
||||
maze \
|
||||
mosaic \
|
||||
pagecurl \
|
||||
$(PRINT) \
|
||||
$(print) \
|
||||
$(pygimp) \
|
||||
rcm \
|
||||
sgi \
|
||||
sel2path \
|
||||
$(TWAIN) \
|
||||
$(WEBBROWSER) \
|
||||
$(WINSNAP) \
|
||||
$(XJT) \
|
||||
$(webbrowser) \
|
||||
$(win32dirs) \
|
||||
$(xjt) \
|
||||
common
|
||||
|
|
|
|||
Loading…
Reference in a new issue