+2001-06-07 Havoc Pennington <hp@redhat.com>
+
+ * m4macros/glib-2.0.m4: subst GLIB_GENMARSHAL, GOBJECT_QUERY,
+ GLIB_MKENUMS variables
+
+ * gmodule-2.0.pc.in: add gmodule_supported variable
+
+ * glib-2.0.pc.in: add glib_genmarshal, gobject_query,
+ glib_mkenums variables
+
+ * configure.in: put G_MODULE_SUPPORTED value into
+ .pc files
+
+ * autogen.sh: support AUTOGEN_SUBDIR_MODE
+
+ * Makefile.am: add -uninstalled.pc.in to EXTRA_DIST
+
2001-06-07 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: Look for nanosleep function.
+2001-06-07 Havoc Pennington <hp@redhat.com>
+
+ * m4macros/glib-2.0.m4: subst GLIB_GENMARSHAL, GOBJECT_QUERY,
+ GLIB_MKENUMS variables
+
+ * gmodule-2.0.pc.in: add gmodule_supported variable
+
+ * glib-2.0.pc.in: add glib_genmarshal, gobject_query,
+ glib_mkenums variables
+
+ * configure.in: put G_MODULE_SUPPORTED value into
+ .pc files
+
+ * autogen.sh: support AUTOGEN_SUBDIR_MODE
+
+ * Makefile.am: add -uninstalled.pc.in to EXTRA_DIST
+
2001-06-07 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: Look for nanosleep function.
+2001-06-07 Havoc Pennington <hp@redhat.com>
+
+ * m4macros/glib-2.0.m4: subst GLIB_GENMARSHAL, GOBJECT_QUERY,
+ GLIB_MKENUMS variables
+
+ * gmodule-2.0.pc.in: add gmodule_supported variable
+
+ * glib-2.0.pc.in: add glib_genmarshal, gobject_query,
+ glib_mkenums variables
+
+ * configure.in: put G_MODULE_SUPPORTED value into
+ .pc files
+
+ * autogen.sh: support AUTOGEN_SUBDIR_MODE
+
+ * Makefile.am: add -uninstalled.pc.in to EXTRA_DIST
+
2001-06-07 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: Look for nanosleep function.
+2001-06-07 Havoc Pennington <hp@redhat.com>
+
+ * m4macros/glib-2.0.m4: subst GLIB_GENMARSHAL, GOBJECT_QUERY,
+ GLIB_MKENUMS variables
+
+ * gmodule-2.0.pc.in: add gmodule_supported variable
+
+ * glib-2.0.pc.in: add glib_genmarshal, gobject_query,
+ glib_mkenums variables
+
+ * configure.in: put G_MODULE_SUPPORTED value into
+ .pc files
+
+ * autogen.sh: support AUTOGEN_SUBDIR_MODE
+
+ * Makefile.am: add -uninstalled.pc.in to EXTRA_DIST
+
2001-06-07 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: Look for nanosleep function.
+2001-06-07 Havoc Pennington <hp@redhat.com>
+
+ * m4macros/glib-2.0.m4: subst GLIB_GENMARSHAL, GOBJECT_QUERY,
+ GLIB_MKENUMS variables
+
+ * gmodule-2.0.pc.in: add gmodule_supported variable
+
+ * glib-2.0.pc.in: add glib_genmarshal, gobject_query,
+ glib_mkenums variables
+
+ * configure.in: put G_MODULE_SUPPORTED value into
+ .pc files
+
+ * autogen.sh: support AUTOGEN_SUBDIR_MODE
+
+ * Makefile.am: add -uninstalled.pc.in to EXTRA_DIST
+
2001-06-07 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: Look for nanosleep function.
+2001-06-07 Havoc Pennington <hp@redhat.com>
+
+ * m4macros/glib-2.0.m4: subst GLIB_GENMARSHAL, GOBJECT_QUERY,
+ GLIB_MKENUMS variables
+
+ * gmodule-2.0.pc.in: add gmodule_supported variable
+
+ * glib-2.0.pc.in: add glib_genmarshal, gobject_query,
+ glib_mkenums variables
+
+ * configure.in: put G_MODULE_SUPPORTED value into
+ .pc files
+
+ * autogen.sh: support AUTOGEN_SUBDIR_MODE
+
+ * Makefile.am: add -uninstalled.pc.in to EXTRA_DIST
+
2001-06-07 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: Look for nanosleep function.
+2001-06-07 Havoc Pennington <hp@redhat.com>
+
+ * m4macros/glib-2.0.m4: subst GLIB_GENMARSHAL, GOBJECT_QUERY,
+ GLIB_MKENUMS variables
+
+ * gmodule-2.0.pc.in: add gmodule_supported variable
+
+ * glib-2.0.pc.in: add glib_genmarshal, gobject_query,
+ glib_mkenums variables
+
+ * configure.in: put G_MODULE_SUPPORTED value into
+ .pc files
+
+ * autogen.sh: support AUTOGEN_SUBDIR_MODE
+
+ * Makefile.am: add -uninstalled.pc.in to EXTRA_DIST
+
2001-06-07 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: Look for nanosleep function.
+2001-06-07 Havoc Pennington <hp@redhat.com>
+
+ * m4macros/glib-2.0.m4: subst GLIB_GENMARSHAL, GOBJECT_QUERY,
+ GLIB_MKENUMS variables
+
+ * gmodule-2.0.pc.in: add gmodule_supported variable
+
+ * glib-2.0.pc.in: add glib_genmarshal, gobject_query,
+ glib_mkenums variables
+
+ * configure.in: put G_MODULE_SUPPORTED value into
+ .pc files
+
+ * autogen.sh: support AUTOGEN_SUBDIR_MODE
+
+ * Makefile.am: add -uninstalled.pc.in to EXTRA_DIST
+
2001-06-07 Sebastian Wilhelmi <wilhelmi@ira.uka.de>
* configure.in: Look for nanosleep function.
gobject-2.0.pc.in \
gmodule-2.0.pc.in \
gthread-2.0.pc.in \
+ glib-2.0-uninstalled.pc.in \
+ gobject-2.0-uninstalled.pc.in \
+ gmodule-2.0-uninstalled.pc.in \
+ gthread-2.0-uninstalled.pc.in \
gen-unicode-tables.pl
# These may be in the builddir too
exit 1
}
-if test -z "$*"; then
- echo "I am going to run ./configure with no arguments - if you wish "
- echo "to pass any to it, please specify them on the $0 command line."
+if test -z "$AUTOGEN_SUBDIR_MODE"; then
+ if test -z "$*"; then
+ echo "I am going to run ./configure with no arguments - if you wish "
+ echo "to pass any to it, please specify them on the $0 command line."
+ fi
fi
case $CC in
autoconf
cd $ORIGDIR
-$srcdir/configure --enable-maintainer-mode "$@"
+if test -z "$AUTOGEN_SUBDIR_MODE"; then
+ $srcdir/configure --enable-maintainer-mode "$@"
-echo
-echo "Now type 'make' to compile $PROJECT."
+ echo
+ echo "Now type 'make' to compile $PROJECT."
+fi
\ No newline at end of file
dnl *** done, have we got an implementation?
if test -z "$G_MODULE_IMPL"; then
G_MODULE_IMPL=0
+ G_MODULE_SUPPORTED=false
+else
+ G_MODULE_SUPPORTED=true
fi
AC_MSG_CHECKING(for the suffix of shared libraries)
esac
AC_MSG_RESULT(.$glib_gmodule_suffix)
+AC_SUBST(G_MODULE_SUPPORTED)
AC_SUBST(G_MODULE_IMPL)
AC_SUBST(G_MODULE_LIBS)
AC_SUBST(G_MODULE_LIBS_EXTRA)
AC_OUTPUT([
glib-2.0.pc
-glib-config-2.0
+glib-2.0-uninstalled.pc
gmodule-2.0.pc
+gmodule-2.0-uninstalled.pc
gthread-2.0.pc
+gthread-2.0-uninstalled.pc
gobject-2.0.pc
+gobject-2.0-uninstalled.pc
+glib-config-2.0
glib.spec
Makefile
build/Makefile
Portable way to copy <type>va_list</type> variables.
</para>
-<!-- # Unused Parameters # -->
@ap1: the <type>va_list</type> variable to place a copy of @ap2 in.
@ap2: a <type>va_list</type>.
--- /dev/null
+glib_genmarshal=${pc_top_builddir}/${pcfiledir}/gobject/glib-genmarshal
+gobject_query=${pc_top_builddir}/${pcfiledir}/gobject/gobject-query
+glib_mkenums=${pc_top_builddir}/${pcfiledir}/@srcdir@/gobject/glib-mkenums
+
+Name: GLib Uninstalled
+Description: C Utility Library, Not Installed
+Version: @VERSION@
+Libs: ${pc_top_builddir}/${pcfiledir}/libglib-1.3.la @ICONV_LIBS@ @INTLLIBS@
+Cflags: -I${pc_top_builddir}/${pcfiledir} -I${pc_top_builddir}/${pcfiledir}/@srcdir@
libdir=@libdir@
includedir=@includedir@
+glib_genmarshal=glib-genmarshal
+gobject_query=gobject-query
+glib_mkenums=glib-mkenums
+
Name: GLib
Description: C Utility Library
Version: @VERSION@
gobject-2.0.pc.in \
gmodule-2.0.pc.in \
gthread-2.0.pc.in \
+ glib-2.0-uninstalled.pc.in \
+ gobject-2.0-uninstalled.pc.in \
+ gmodule-2.0-uninstalled.pc.in \
+ gthread-2.0-uninstalled.pc.in \
gen-unicode-tables.pl
# These may be in the builddir too
--- /dev/null
+gmodule_supported=@G_MODULE_SUPPORTED@
+
+Name: GModule Uninstalled
+Description: Dynamic module loader for GLib, Not Installed
+Requires: glib-2.0-uninstalled
+Version: @VERSION@
+Libs: @G_MODULE_LDFLAGS@ ${pc_top_builddir}/${pcfiledir}/gmodule/libgmodule-1.3.la @G_MODULE_LIBS@
+Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@/gmodule
libdir=@libdir@
includedir=@includedir@
+gmodule_supported=@G_MODULE_SUPPORTED@
+
Name: GModule
Description: Dynamic module loader for GLib
Requires: glib-2.0
--- /dev/null
+Name: GObject Uninstalled
+Description: Object/type system for GLib, Not Installed
+Requires: glib-2.0-uninstalled
+Version: @VERSION@
+Libs: ${pc_top_builddir}/${pcfiledir}/gobject/libgobject-1.3.la
+## cflags contains builddir in addition to srcdir because of gmarshal.h
+Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ -I${pc_top_builddir}/${pcfiledir}
--- /dev/null
+Name: GThread Uninstalled
+Description: Thread support for GLib, Not Installed
+Requires: glib-2.0-uninstalled
+Version: @VERSION@
+Libs: ${pc_top_builddir}/${pcfiledir}/gthread/libgthread-1.3.la @G_THREAD_LIBS@
+Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
- min_glib_version=ifelse([$1], ,1.3.3,$1)
- AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
-
no_glib=""
if test x$PKG_CONFIG != xno ; then
- if pkg-config --atleast-pkgconfig-version 0.5 ; then
+ if $PKG_CONFIG --atleast-pkgconfig-version 0.7 ; then
:
else
- echo *** pkg-config too old; version 0.5 or better required.
+ echo *** pkg-config too old; version 0.7 or better required.
no_glib=yes
PKG_CONFIG=no
fi
fi
+ ## don't try to run the test against uninstalled libtool libs
+ if $PKG_CONFIG --uninstalled $pkg_config_args; then
+ echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH"
+ enable_glibtest=no
+ fi
+
+ min_glib_version=ifelse([$1], ,1.3.3,$1)
+ AC_MSG_CHECKING(for GLIB - version >= $min_glib_version)
+
+ if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then
+ :
+ else
+ no_glib = yes
+ fi
+
if test x"$no_glib" = x ; then
+ GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
+ GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0`
+ GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
+
GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args`
GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args`
glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \
fi
GLIB_CFLAGS=""
GLIB_LIBS=""
+ GLIB_GENMARSHAL=""
+ GOBJECT_QUERY=""
+ GLIB_MKENUMS=""
ifelse([$3], , :, [$3])
fi
AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GLIB_LIBS)
+ AC_SUBST(GLIB_GENMARSHAL)
+ AC_SUBST(GOBJECT_QUERY)
+ AC_SUBST(GLIB_MKENUMS)
rm -f conf.glibtest
])
projects / dana / cg-glib.git / commitdiff