Commit 284c7e55 authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen

Add AM_PROG_CC_C_O.

2007-11-09  Matthias Clasen <mclasen@redhat.com>

        * configure.in: Add AM_PROG_CC_C_O.

        * Makefile.am: Remove the install-exec-local hook and use
        configexecincludedir_DATA instead, in an attempt to avoid
        automake 1.9 <> 1.10 incompatibilities.

        * glib/Makefile.am: Rename MIRRORING_TAB_SOURCES, since
        automake 1.10 complains.


svn path=/trunk/; revision=5848
parent 6a647bae
2007-11-09 Matthias Clasen <mclasen@redhat.com>
* configure.in: Add AM_PROG_CC_C_O.
* Makefile.am: Remove the install-exec-local hook and use
configexecincludedir_DATA instead, in an attempt to avoid
automake 1.9 <> 1.10 incompatibilities.
* glib/Makefile.am: Rename MIRRORING_TAB_SOURCES, since
automake 1.10 complains.
2007-11-09 Matthias Clasen <mclasen@redhat.com>
* glib/gspawn.c (g_spawn_sync): Improve the docs. (#491968,
......
......@@ -10,6 +10,7 @@ INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@ \
-DG_DISABLE_DEPRECATED -DGLIB_COMPILATION
EXTRA_DIST = \
ChangeLog.pre-2-14 \
ChangeLog.pre-2-12 \
ChangeLog.pre-2-10 \
ChangeLog.pre-2-8 \
......@@ -28,6 +29,7 @@ EXTRA_DIST = \
HACKING \
MAINTAINERS \
autogen.sh \
mkinstalldirs \
makefile.msc \
glibconfig.h.win32.in \
msvc_recommended_pragmas.h \
......@@ -55,13 +57,7 @@ BUILT_EXTRA_DIST = \
gtk-doc.make
configexecincludedir = $(libdir)/glib-2.0/include
#configexecinclude_DATA = glibconfig.h
install-exec-local: glibconfig.h
$(MKDIR_P) $(DESTDIR)$(configexecincludedir)
file=$(DESTDIR)$(configexecincludedir)/glibconfig.h; \
if test -r $$file && cmp -s glibconfig.h $$file; then :; \
else $(INSTALL_DATA) glibconfig.h $$file; fi
configexecinclude_DATA = glibconfig.h
uninstall-local:
rm -f $(DESTDIR)$(configexecincludedir)/glibconfig.h
......
......@@ -264,6 +264,7 @@ AM_CONDITIONAL(HAVE_CXX, [test "$CXX" != ""])
AC_LANG_RESTORE
AM_PROG_CC_STDC
AM_PROG_CC_C_O
AC_PROG_INSTALL
AC_SYS_LARGEFILE
......
......@@ -44,7 +44,7 @@ endif
BUILT_SOURCES = galias.h galiasdef.c
MIRRORING_TAB_SOURCES = \
MIRRORING_TAB_SOURCE = \
glib-mirroring-tab/Makefile \
glib-mirroring-tab/gen-mirroring-tab.c \
glib-mirroring-tab/packtab.h \
......@@ -63,7 +63,7 @@ EXTRA_DIST = \
glib.symbols \
gregex.c \
gregex.h \
$(MIRRORING_TAB_SOURCES)
$(MIRRORING_TAB_SOURCE)
# These may be in the builddir too
BUILT_EXTRA_DIST = \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment