luisgulo/gambas-source-code
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[CONFIGURATION]

Browse source 
* NEW: Print disabled components individually.

[GB.QT4]
* BUG: ComboBox background color is correctly handled now.


git-svn-id: svn://localhost/gambas/trunk@4739 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Benoît Minisini 2012-05-18 01:19:15 +00:00
parent d1fb3b885e
commit 8ad1afe673
36 changed files with 107 additions and 224 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
acinclude.m4
View file

@ -185,7 +185,7 @@ AC_DEFUN([GB_INIT],
dnl AC_TYPE_SIZE_T
dnl AC_HEADER_TIME
dnl AC_STRUCT_TM
AC_C_LONG_DOUBLE
dnl AC_C_LONG_DOUBLE
dnl ---- Checks for library functions.
@ -343,7 +343,7 @@ AC_DEFUN([GB_INIT],
AC_SUBST(AM_CXXFLAGS)
AC_SUBST(AM_CXXFLAGS_OPT)
rm -f DISABLED
rm -f DISABLED DISABLED.*
])
@ -698,7 +698,7 @@ cd $gb_save
##
## $1 = Component key in lower case (ex: pgsql)
## $2 = Component key in upper case (ex: PGSQL)
## $3 = Component name (ex: PostgreSQL)
## $3 = Component name (ex: gb.db.postgresql)
## $4 = Sub-directory name
## $5 = pkg-config module(s) name(s) with optional required version(s)
## $6 = Warning message (optional)
@ -716,17 +716,17 @@ AC_DEFUN([GB_COMPONENT_PKG_CONFIG],
gb_enable_$1=yes
)
AC_ARG_WITH($1-includes,
[ --with-$1-includes where the $3 headers are located. ],
[ gb_inc_$1="$withval" ])
dnl AC_ARG_WITH($1-includes,
dnl [ --with-$1-includes where the $3 headers are located. ],
dnl [ gb_inc_$1="$withval" ])
AC_ARG_WITH($1-libraries,
[ --with-$1-libraries where the $3 libraries are located. ],
[ gb_lib_$1="$withval" ])
dnl AC_ARG_WITH($1-libraries,
dnl [ --with-$1-libraries where the $3 libraries are located. ],
dnl [ gb_lib_$1="$withval" ])
have_$1=no
if test "$gb_enable_$1"="yes" && test ! -e DISABLED; then
if test "$gb_enable_$1"="yes" && test ! -e DISABLED.$3; then
AC_MSG_CHECKING(for $3 component with pkg-config)
@ -759,24 +759,22 @@ AC_DEFUN([GB_COMPONENT_PKG_CONFIG],
if test "$have_$1" = "no"; then
if test "$4" = "src" && test "$gb_in_component_search" != "yes"; then
if test "$gb_in_component_search" != "yes"; then
touch DISABLED
touch DISABLED.$3
fi
AC_MSG_RESULT(no)
else
dnl if test "$4" = "src"; then
dnl rm -f DISABLED
dnl fi
AC_DEFINE(HAVE_$2_COMPONENT, 1, Have $3)
AC_DEFINE(HAVE_$2_COMPONENT, 1, [Have $3 component])
AC_MSG_RESULT(OK)
fi
if test "$have_$1" = "no" || test -e DISABLED; then
if test "$have_$1" = "no" || test -e DISABLED.$3; then
$2_INC=""
$2_LIB=""
@ -805,7 +803,7 @@ dnl fi
##
## $1 = Component key in lower case (ex: postgresql)
## $2 = Component key in upper case (ex: POSTGRESQL)
## $3 = Component name (ex: PostgreSQL)
## $3 = Component name (ex: gb.db.postgresql)
## $4 = Sub-directory name
## $5 = How to get include path (must return it in gb_val)
## $6 = How to get library path (must return it in gb_val)
@ -829,7 +827,7 @@ AC_DEFUN([GB_COMPONENT],
gb_inc_$1=no
gb_lib_$1=no
if test "$gb_enable_$1" = "yes" && test ! -e DISABLED; then
if test "$gb_enable_$1" = "yes" && test ! -e DISABLED.$3; then
## Checking for headers
@ -938,13 +936,12 @@ AC_DEFUN([GB_COMPONENT],
else
have_$1=no
if test "$4" = "src"; then
touch DISABLED
fi
touch DISABLED
touch DISABLED.$3
fi
if test "$have_$1" = "no" || test -e DISABLED; then
if test "$have_$1" = "no" || test -e DISABLED.$3; then
$2_INC=""
$2_LIB=""

15
configure.ac
View file

@ -65,12 +65,15 @@ AC_OUTPUT(Makefile)
GB_CLEAR_MESSAGES
for comp in gb.*; do
if test -e $comp/DISABLED; then
if ! test -s $srcdir/warnings.log; then
GB_MESSAGE([THESE COMPONENTS ARE DISABLED:])
fi
GB_MESSAGE([- $comp])
for gb_dir in gb.*; do
if test -e $gb_dir/DISABLED; then
for gb_comp in $gb_dir/DISABLED.*; do
if ! test -s $srcdir/warnings.log; then
GB_MESSAGE([THESE COMPONENTS ARE DISABLED:])
fi
gb_comp=`basename "$gb_comp"`
GB_MESSAGE([- ${gb_comp#DISABLED.}])
done
fi
done

2
examples/examples/Multimedia/MediaPlayer/.project
View file

@ -12,6 +12,6 @@ Component=gb.desktop
Component=gb.form.dialog
Component=gb.settings
Component=gb.media
Environment="GB_GUI=gb.gtk"
Environment="GB_GUI=gb.qt4"
TabSize=2
Packager=1

1
examples/examples/Multimedia/MediaPlayer/.src/FControl.form
View file

@ -4,6 +4,7 @@
MoveScaled(0,0,64,23)
Background = &H000000&
Resizable = False
Border = False
Utility = True
Opacity = 70
Spacing = True

15
gb.cairo/configure.ac
View file

@ -6,19 +6,8 @@ GB_INIT(gb.cairo)
AC_PROG_LIBTOOL
GB_COMPONENT_PKG_CONFIG(
cairo,
CAIRO,
[Cairo component],
[src],
cairo ">= 1.6.0"
)
GB_COMPONENT_PKG_CONFIG(
cairo_ft,
CAIRO_FT,
[FreeType backend for Cairo],
[src],
cairo-ft ">= 1.6.0"
cairo, CAIRO, gb.cairo, [src],
cairo ">= 1.6.0" cairo-ft ">= 1.6.0"
)
AC_OUTPUT( Makefile src/Makefile )

5
gb.compress.bzlib2/configure.ac
View file

@ -8,10 +8,7 @@ AC_PROG_LIBTOOL
dnl ---- bzlib2 compression driver
GB_COMPONENT(
bzlib2,
BZLIB2,
[bzlib2 compression],
[src],
bzlib2, BZLIB2, gb.compress.bzlib2, [src],
[GB_FIND(bzlib.h, /usr/local/lib /usr/local /opt /usr/lib /usr, include)],
[GB_FIND(libbz2.$SHLIBEXT, /usr/local /opt /usr, lib)],
[$C_LIB -lbz2])

5
gb.compress.zlib/configure.ac
View file

@ -8,10 +8,7 @@ AC_PROG_LIBTOOL
dnl ---- zlib compression driver
GB_COMPONENT(
zlib,
ZLIB,
[zlib compression],
[src],
zlib, ZLIB, gb.compress.zlib, [src],
[GB_FIND(zlib.h, /usr/local/lib /usr/local /opt /usr/lib /usr, include)],
[GB_FIND(libz.$SHLIBEXT, /usr/local /opt /usr, lib)],
[$C_LIB -lz])

5
gb.crypt/configure.ac
View file

@ -6,10 +6,7 @@ GB_INIT(gb.crypt)
AC_PROG_LIBTOOL
GB_COMPONENT(
crypt,
CRYPT,
[DES/MD5 crypt component],
[src],
crypt, CRYPT, gb.crypt, [src],
[GB_FIND(crypt.h, /usr/lib /usr, include)],
[GB_FIND(libcrypt.$SHLIBEXT, /usr/local /usr, lib)],
[-lcrypt])

5
gb.db.mysql/configure.ac
View file

@ -6,10 +6,7 @@ GB_INIT(gb.db.mysql)
LT_INIT
GB_COMPONENT(
mysql,
MYSQL,
[MySQL driver],
[src],
mysql, MYSQL, gb.db.mysql, [src],
[GB_FIND(mysql.h my_config.h, /opt/local /opt /usr/local/lib /usr/local /usr/lib /usr, include mysql*/include)],
[GB_FIND(libmysqlclient.$SHLIBEXT, /opt/local /opt /usr/local /usr, lib mysql*/lib)],
[$C_LIB -lmysqlclient -lz])

5
gb.db.odbc/configure.ac
View file

@ -13,10 +13,7 @@ AC_PROG_LIBTOOL
dnl ---- ODBC driver
GB_COMPONENT(
odbc,
ODBC,
[ODBC driver],
[src],
odbc, ODBC, gb.db.odbc, [src],
[GB_FIND(sql.h sqlext.h sqltypes.h, /usr/local/lib /usr/local /opt /usr/lib /usr, include odbc*/include)],
[GB_FIND(libodbc.$SHLIBEXT, /usr/local /opt /usr, lib odbc*/lib )],
[$C_LIB -lodbc])

5
gb.db.postgresql/configure.ac
View file

@ -8,10 +8,7 @@ AC_PROG_LIBTOOL
dnl ---- PostgreSQL driver
GB_COMPONENT(
postgresql,
POSTGRESQL,
[PostgreSQL driver],
[src],
postgresql, POSTGRESQL, gb.db.postgresql, [src],
[GB_FIND(libpq-fe.h postgres.h pg_type.h, /usr/local/lib /usr/local /opt /usr/lib /usr, include/pgsql* pgsql*/include include/postgresql* postgresql*/include include)],
[GB_FIND(libpq.$SHLIBEXT, /usr/local /opt /usr, lib pgsql*/lib postgresql*/lib)],
[$C_LIB -lpq])

5
gb.db.sqlite2/configure.ac
View file

@ -13,10 +13,7 @@ AC_PROG_LIBTOOL
dnl ---- SQLite driver
GB_COMPONENT(
sqlite2,
SQLITE2,
[SQLite 2 driver],
[src],
sqlite2, SQLITE2, gb.db.sqlite2, [src],
[GB_FIND(sqlite.h, /usr/local/lib /usr/local /opt /usr/lib /usr, include sqlite*/include)],
[GB_FIND(libsqlite.$SHLIBEXT, /usr/local /opt /usr, lib sqlite*/lib)],
[$C_LIB $CXX_LIB -lsqlite])

5
gb.db.sqlite3/configure.ac
View file

@ -6,10 +6,7 @@ GB_INIT(gb.db.sqlite3)
AC_PROG_LIBTOOL
GB_COMPONENT_SEARCH(
sqlite3,
SQLITE3,
[SQLite 3 driver],
[src],
sqlite3, SQLITE3, gb.db.sqlite3, [src],
sqlite3 ">= 3.0",
[GB_FIND(sqlite3.h, /usr/local/lib /usr/local /opt /usr/lib /usr, include sqlite*/include)],
[GB_FIND(libsqlite3.$SHLIBEXT, /usr/local /opt /usr, lib sqlite*/lib)],

5
gb.dbus/configure.ac
View file

@ -5,10 +5,7 @@ AC_CONFIG_MACRO_DIR([m4])
GB_INIT(gb.dbus)
AC_PROG_LIBTOOL
GB_COMPONENT_PKG_CONFIG(
dbus,
DBUS,
[DBUS management],
[src],
dbus, DBUS, gb.dbus, [src],
dbus-1)
AC_OUTPUT( Makefile src/Makefile )

10
gb.desktop/configure.ac
View file

@ -10,20 +10,14 @@ GB_CHECK_XWINDOW
AC_CHECK_LIB(Xtst, XTestQueryExtension, [X_LIBS="$X_LIBS -lXtst"], [touch DISABLED], [$X_LIBS])
GB_COMPONENT(
desktop,
DESKTOP,
[Desktop-neutral routines],
[src],
desktop, DESKTOP, gb.desktop, [src],
[],
[],
[$C_LIB $THREAD_LIB $X_LIBS],
[$THREAD_INC ])
GB_COMPONENT_PKG_CONFIG(
gnome,
GNOME,
[Gnome desktop routines],
[gnome],
gnome, GNOME, gb.desktop.gnome, [gnome],
gnome-keyring-1)
AC_OUTPUT( \

20
gb.gsl/configure.ac
View file

@ -5,19 +5,15 @@ AC_CONFIG_MACRO_DIR([m4])
GB_INIT(gb.gsl)
AC_PROG_LIBTOOL
GB_COMPONENT_PKG_CONFIG(
gsl,
GSL,
[GNU Scientific Library component],
[src],
gsl, GSL, gb.gsl, [src],
gsl)
GB_COMPONENT_SEARCH(
gslcblas,
GSLCBLAS,
[GSL BLAS],
[src],
libgsl libgslcblas,
[GB_FIND(gsl/gsl_cblas.h gsl/gsl_math.h, /usr /usr/local `gsl-config --prefix`, include include/gsl)],
[GB_FIND(libgslcblas.$SHLIBEXT libgsl.$SHLIBEXT, /usr/lib /usr/local /usr/local/lib `gsl-config --prefix`, lib)],
[$X_LIBS -llibgsl -llibgslcblas])
gslcblas, GSLCBLAS, gb.gsl, [src],
libgsl libgslcblas,
[GB_FIND(gsl/gsl_cblas.h gsl/gsl_math.h, /usr /usr/local `gsl-config --prefix`, include include/gsl)],
[GB_FIND(libgslcblas.$SHLIBEXT libgsl.$SHLIBEXT, /usr/lib /usr/local /usr/local/lib `gsl-config --prefix`, lib)],
[$X_LIBS -llibgsl -llibgslcblas])
AC_OUTPUT( Makefile src/Makefile )
GB_PRINT_MESSAGES

10
gb.gtk/configure.ac
View file

@ -8,18 +8,12 @@ AC_PROG_LIBTOOL
GB_CHECK_XWINDOW
GB_COMPONENT_PKG_CONFIG(
gtk,
GTK,
[GTK+ toolkit],
[src],
gtk, GTK, gb.gtk, [src],
gtk+-2.0 ">= 2.16" librsvg-2.0 ">= 2.14.3" cairo ">= 1.6.0" cairo-ft ">= 1.6.0" gtk+-unix-print-2.0 ">= 2.10"
)
GB_COMPONENT_PKG_CONFIG(
gtkopengl,
GTKOPENGL,
[GTKglext toolkit],
[opengl],
gtkopengl, GTKOPENGL, gb.gtk.opengl, [opengl],
gtkglext-1.0
)

5
gb.image.imlib/configure.ac
View file

@ -6,10 +6,7 @@ GB_INIT(gb.image.imlib)
AC_PROG_LIBTOOL
GB_COMPONENT_PKG_CONFIG(
image_imlib,
IMAGE_IMLIB,
[Image routines based on the Imlib2 library],
[src],
image_imlib, IMAGE_IMLIB, gb.image.imlib, [src],
imlib2 ">= 1.4.0"
)

5
gb.image.io/configure.ac
View file

@ -6,10 +6,7 @@ GB_INIT(gb.image.io)
AC_PROG_LIBTOOL
GB_COMPONENT_PKG_CONFIG(
image_io,
IMAGE_IO,
[Image loading and saving],
[src],
image_io, IMAGE_IO, gb.image.io, [src],
gdk-pixbuf-2.0 ">= 2.4.13"
)

5
gb.libxml/configure.ac
View file

@ -6,10 +6,7 @@ GB_INIT(gb.libxml)
AC_PROG_LIBTOOL
GB_COMPONENT_PKG_CONFIG(
xml,
XML,
[XML parser component],
[src],
xml, XML, gb.libxml, [src],
libxml-2.0)
AC_OUTPUT( \

5
gb.media/configure.ac
View file

@ -5,10 +5,7 @@ AC_CONFIG_MACRO_DIR([m4])
GB_INIT(gb.media)
AC_PROG_LIBTOOL
GB_COMPONENT_PKG_CONFIG(
media,
MEDIA,
[GStreamer media],
[src],
media, MEDIA, gb.media, [src],
gstreamer-0.10 gstreamer-interfaces-0.10
)
AC_OUTPUT( Makefile src/Makefile )

5
gb.ncurses/configure.ac
View file

@ -6,10 +6,7 @@ GB_INIT(gb.ncurses)
AC_PROG_LIBTOOL
GB_COMPONENT(
ncurses,
NCURSES,
[NCurses component],
[src],
ncurses, NCURSES, gb.ncurses, [src],
[GB_FIND(ncurses.h panel.h, /usr/lib /usr, include)],
[GB_FIND(libncurses.$SHLIBEXT libpanel.$SHLIBEXT, /usr/local /usr, lib)],
[-lpanel -lncurses])

5
gb.net.curl/configure.ac
View file

@ -6,10 +6,7 @@ GB_INIT(gb.net.curl)
AC_PROG_LIBTOOL
GB_COMPONENT_PKG_CONFIG(
curl,
CURL,
[Advanced networking component],
[src],
curl, CURL, gb.net.curl, [src],
libcurl ">= 7.13"
)

5
gb.net.smtp/configure.ac
View file

@ -8,10 +8,7 @@ GB_INIT(gb.net.smtp)
AC_PROG_LIBTOOL
GB_COMPONENT_PKG_CONFIG(
smtp,
SMTP,
[SMTP client],
[src],
smtp, SMTP, gb.net.smtp, [src],
glib-2.0)
AC_OUTPUT( Makefile src/Makefile )

5
gb.net/configure.ac
View file

@ -6,10 +6,7 @@ GB_INIT(gb.net)
AC_PROG_LIBTOOL
GB_COMPONENT(
net,
NET,
[Networking component],
[src],
net, NET, gb.net, [src],
[],
[],
[$C_LIB $THREAD_LIB],

14
gb.opengl/configure.ac
View file

@ -6,17 +6,15 @@ GB_INIT(gb.opengl)
AC_PROG_LIBTOOL
GB_COMPONENT_PKG_CONFIG(
opengl,
OPENGL,
[OpenGL support component],
[src],
opengl, OPENGL, gb.opengl, [src],
[gl glew])
GB_COMPONENT_PKG_CONFIG(
glu,
GLU,
[OpenGL Utility support component],
[glu],
glsl, GLSL, gb.opengl.glsl, [glsl],
[gl glew])
GB_COMPONENT_PKG_CONFIG(
glu, GLU, gb.opengl.glu, [glu],
[glu])
AC_OUTPUT( \

2
gb.opengl/src/Makefile.am
View file

@ -1,7 +1,7 @@
COMPONENT = gb.opengl
include $(top_srcdir)/component.am
SUBDIRS = glsl @GLU_DIR@
SUBDIRS = @GLSL_DIR@ @GLU_DIR@
gblib_LTLIBRARIES = gb.opengl.la

5
gb.pcre/configure.ac
View file

@ -6,10 +6,7 @@ GB_INIT(gb.pcre)
AC_PROG_LIBTOOL
GB_COMPONENT(
pcre,
PCRE,
[Perl Compatible Regular Expression component],
[src],
pcre, PCRE, gb.pcre, [src],
[GB_FIND(pcre.h, /usr/local/lib /usr/local /usr/lib /usr, include)],
[GB_FIND(libpcre.$SHLIBEXT, /usr/local /usr /, lib)],
[-lpcre])

5
gb.pdf/configure.ac
View file

@ -6,10 +6,7 @@ GB_INIT(gb.pdf)
AC_PROG_LIBTOOL
GB_COMPONENT_PKG_CONFIG(
poppler,
POPPLER,
[Poppler PDF library],
[src],
poppler, POPPLER, gb.pdf, [src],
poppler ">= 0.5"
)

20
gb.qt4/configure.ac
View file

@ -20,34 +20,22 @@ GB_CHECK_XWINDOW
AM_CONDITIONAL(XWINDOW, test x"$have_x" = xyes)
GB_COMPONENT_PKG_CONFIG(
qt,
QT,
[QT4 toolkit],
[src],
qt, QT, gb.qt4, [src],
QtCore ">= 4.5.0" QtGui Qt3Support QtSvg
)
GB_COMPONENT_PKG_CONFIG(
qtext,
QTEXT,
[QT4 toolkit extension],
[ext],
qtext, QTEXT, gb.qt4.ext, [ext],
QtCore ">= 4.5.0" QtGui Qt3Support
)
GB_COMPONENT_PKG_CONFIG(
qtwebkit,
QTWEBKIT,
[QT4 webkit component],
[webkit],
qtwebkit, QTWEBKIT, gb.qt4.webkit, [webkit],
QtCore ">= 4.5.0" QtGui QtNetwork QtDBus QtXml QtWebKit ">= 4.5.0"
)
GB_COMPONENT_PKG_CONFIG(
qtopengl,
QTOPENGL,
[QT4 OpenGL],
[opengl],
qtopengl, QTOPENGL, gb.qt4.opengl, [opengl],
QtCore ">= 4.5.0" QtGui QtOpenGL
)

13
gb.qt4/src/CWidget.cpp
View file

@ -66,6 +66,7 @@
#include <QProgressBar>
#include <QAbstractEventDispatcher>
#include <QListWidget>
#include <QComboBox>
#ifndef NO_X_WINDOW
static QMap<int, int> _x11_to_qt_keycode;
@ -1404,6 +1405,18 @@ void CWIDGET_reset_color(CWIDGET *_object)
w->setPalette(palette);
get_viewport(WIDGET)->setPalette(vpalette);
}
else if (qobject_cast<QComboBox *>(w))
{
palette = QPalette();
if (bg != COLOR_DEFAULT)
palette.setColor(QPalette::Base, QColor((QRgb)bg));
if (fg != COLOR_DEFAULT)
palette.setColor(w->foregroundRole(), QColor((QRgb)fg));
w->setPalette(palette);
}
else
{
palette = QPalette();

5
gb.sdl.sound/configure.ac
View file

@ -10,10 +10,7 @@ GB_PATH_SDL(1.2.8, [] , [touch DISABLED])
dnl check for SDL libs
GB_COMPONENT(
sdlsound,
SDLSOUND,
[SDL sound],
[src],
sdlsound, SDLSOUND, gb.sdl.sound, [src],
[GB_FIND(SDL_mixer.h SDL_cdrom.h, `sdl-config --prefix`, include/SDL)],
[GB_FIND(libSDL_mixer.$SHLIBEXT, /usr /usr/local `sdl-config --prefix`, lib)],
[-lSDL_mixer],

5
gb.sdl/configure.ac
View file

@ -30,10 +30,7 @@ dnl [$X_LIBS -lSDL_ttf -lGLEW -lXcursor],
dnl [$SDL_CFLAGS])
GB_COMPONENT_SEARCH(
sdl,
SDL,
[SDL],
[src],
sdl, SDL, gb.sdl, [src],
sdl "> 1.2.8" SDL_ttf glew xcursor,
[GB_FIND(GL/glew.h SDL_ttf.h X11/Xcursor/Xcursor.h, /usr /usr/local `sdl-config --prefix`, include include/SDL)],
[GB_FIND(libSDL_ttf.$SHLIBEXT libGLEW.$SHLIBEXT libXcursor.$SHLIBEXT, /usr /usr/local `sdl-config --prefix`, lib)],

10
gb.v4l/configure.ac
View file

@ -6,17 +6,11 @@ GB_INIT(gb.v4l)
AC_PROG_LIBTOOL
GB_COMPONENT_PKG_CONFIG(
v4lconvert,
V4LCONVERT,
[Video For Linux conversion library],
[src],
v4lconvert, V4LCONVERT, gb.v4l, [src],
libv4lconvert)
GB_COMPONENT(
v4l,
V4L,
[Video For Linux component],
[src],
v4l, V4L, gb.v4l, [src],
[GB_FIND(png.h jpeglib.h linux/videodev2.h, /usr/local/lib /usr/local /usr/lib /usr, include)],
[GB_FIND(libpng.$SHLIBEXT libjpeg.$SHLIBEXT, /usr/local /usr, lib)],
[$C_LIB -ljpeg -lpng])

24
gb.xml/configure.ac
View file

@ -7,29 +7,23 @@ AC_PROG_LIBTOOL
GB_CXXFLAGS_GCC_OPTION(-std=c++0x)
GB_COMPONENT(
xml,
XML,
[XML document manipulation],
[src],
xml, XML, gb.xml, [src],
[],
[],
[])
[]
)
GB_COMPONENT(
xmlhtml,
XMLHTML,
[HTML document manipulation],
[html],
xmlhtml, XMLHTML, gb.xml.html, [html],
[],
[],
[])
[]
)
GB_COMPONENT_PKG_CONFIG(
xmlxslt,
XMLXSLT,
[XSLT/XML parser component],
[xslt],
[libxml-2.0, libxslt])
xmlxslt, XMLXSLT, gb.xml.xslt, [xslt],
libxml-2.0 libxslt
)
AC_OUTPUT( \
Makefile \

27
main/configure.ac
View file

@ -11,10 +11,7 @@ AM_PROG_CC_C_O
dnl ---- Check for internationalization library
GB_COMPONENT(
intl,
INTL,
[external internationalization library],
[],
intl, INTL, libintl, [],
[GB_FIND(libintl.h, /opt/local /usr/local /usr, include)],
[GB_FIND(libintl.$SHLIBEXT, /opt/local /usr/local /usr /, lib)],
[-lintl],
@ -24,10 +21,7 @@ GB_COMPONENT(
dnl ---- Check for charset conversion library
GB_COMPONENT(
conv,
CONV,
[optional external charset conversion library],
[],
conv, CONV, libiconv, [],
[GB_FIND(iconv.h, /opt/local /usr/local /usr, include)],
[GB_FIND(libiconv.$SHLIBEXT, /opt/local /usr/local /usr, lib)],
[-liconv],
@ -39,10 +33,7 @@ dnl ---- Check for gettext library
if test "x$GETTEXT_LIB" != x; then
GB_COMPONENT(
gettext,
GETTEXT,
[external gettext library],
[],
gettext, GETTEXT, libgettextlib, [],
[],
[GB_FIND(libgettextlib.$SHLIBEXT, /opt/local /usr/local /usr, lib)],
[-lgettextlib],
@ -54,10 +45,7 @@ fi
dnl ---- Check for ffi library
GB_COMPONENT_SEARCH(
ffi,
FFI,
[foreign function interface],
[],
ffi, FFI, libffi, [],
libffi,
[GB_FIND(ffi.h, /usr/local /usr/local/lib /usr /usr/lib /usr/lib/gcc/*/*, include ffi/include)],
[GB_FIND(libffi.$SHLIBEXT, /usr/local /usr /usr/lib/gcc/*/*, lib .)],
@ -65,10 +53,7 @@ GB_COMPONENT_SEARCH(
if test -z "$FFI_LIB"; then
GB_COMPONENT(
ffi,
FFI,
[foreign function interface],
[],
ffi, FFI, libffi, [],
[GB_FIND(ffi.h, /opt/local /usr/local /usr/local/lib /usr /usr/lib /usr/lib/gcc/*/*, include ffi/include)],
[GB_FIND(libffi.$SHLIBEXT, /usr/local /usr, lib)],
[-lffi])
@ -76,7 +61,7 @@ fi
dnl ---- Remove DISABLED file that could have been generated before
rm -f DISABLED
rm -f DISABLED DISABLED.*
dnl ---- We do not use libtool to load shared libraries anymore!