luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-05-19 20:12:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

[ merged from stable ]

Browse Source 
Mon May  6 11:48:08 2002  Owen Taylor  <otaylor@redhat.com>

	[ merged from stable ]

        * Makefile.am (EXTRA_DIST): Add ChangeLog.pre-2-0 (#78641)

        * m4macros/glib-2.0.m4: save CFLAGS/LIBS properly when
        compiling "what went wrong" test case. (#79330)

        * m4macros/glib-2.0.m4: Remove reference to editing
        pkg-config script. (From Jim Gettys)

        * configure.in: (Look for dyld interfaces before dlopen()
        since OS X can have both. Patch from Jacob Berkman,
        #80438)
This commit is contained in:
Owen Taylor 2002-05-06 16:07:03 +00:00 committed by Owen Taylor
parent a7b7ff8413
commit 83fbec4d46
10 changed files with 123 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@ -1,3 +1,19 @@
Mon May 6 11:48:08 2002 Owen Taylor <otaylor@redhat.com>
[ merged from stable ]
* Makefile.am (EXTRA_DIST): Add ChangeLog.pre-2-0 (#78641)
* m4macros/glib-2.0.m4: save CFLAGS/LIBS properly when
compiling "what went wrong" test case. (#79330)
* m4macros/glib-2.0.m4: Remove reference to editing
pkg-config script. (From Jim Gettys)
* configure.in: (Look for dyld interfaces before dlopen()
since OS X can have both. Patch from Jacob Berkman,
#80438)
2002-05-01 jacob berkman <jacob@ximian.com> 2002-05-01 jacob berkman <jacob@ximian.com>
* configure.in: fix typo on 64-bit printf formatting string * configure.in: fix typo on 64-bit printf formatting string

16
ChangeLog.pre-2-10
View File

@ -1,3 +1,19 @@
Mon May 6 11:48:08 2002 Owen Taylor <otaylor@redhat.com>
[ merged from stable ]
* Makefile.am (EXTRA_DIST): Add ChangeLog.pre-2-0 (#78641)
* m4macros/glib-2.0.m4: save CFLAGS/LIBS properly when
compiling "what went wrong" test case. (#79330)
* m4macros/glib-2.0.m4: Remove reference to editing
pkg-config script. (From Jim Gettys)
* configure.in: (Look for dyld interfaces before dlopen()
since OS X can have both. Patch from Jacob Berkman,
#80438)
2002-05-01 jacob berkman <jacob@ximian.com> 2002-05-01 jacob berkman <jacob@ximian.com>
* configure.in: fix typo on 64-bit printf formatting string * configure.in: fix typo on 64-bit printf formatting string

16
ChangeLog.pre-2-12
View File

@ -1,3 +1,19 @@
Mon May 6 11:48:08 2002 Owen Taylor <otaylor@redhat.com>
[ merged from stable ]
* Makefile.am (EXTRA_DIST): Add ChangeLog.pre-2-0 (#78641)
* m4macros/glib-2.0.m4: save CFLAGS/LIBS properly when
compiling "what went wrong" test case. (#79330)
* m4macros/glib-2.0.m4: Remove reference to editing
pkg-config script. (From Jim Gettys)
* configure.in: (Look for dyld interfaces before dlopen()
since OS X can have both. Patch from Jacob Berkman,
#80438)
2002-05-01 jacob berkman <jacob@ximian.com> 2002-05-01 jacob berkman <jacob@ximian.com>
* configure.in: fix typo on 64-bit printf formatting string * configure.in: fix typo on 64-bit printf formatting string

16
ChangeLog.pre-2-2
View File

@ -1,3 +1,19 @@
Mon May 6 11:48:08 2002 Owen Taylor <otaylor@redhat.com>
[ merged from stable ]
* Makefile.am (EXTRA_DIST): Add ChangeLog.pre-2-0 (#78641)
* m4macros/glib-2.0.m4: save CFLAGS/LIBS properly when
compiling "what went wrong" test case. (#79330)
* m4macros/glib-2.0.m4: Remove reference to editing
pkg-config script. (From Jim Gettys)
* configure.in: (Look for dyld interfaces before dlopen()
since OS X can have both. Patch from Jacob Berkman,
#80438)
2002-05-01 jacob berkman <jacob@ximian.com> 2002-05-01 jacob berkman <jacob@ximian.com>
* configure.in: fix typo on 64-bit printf formatting string * configure.in: fix typo on 64-bit printf formatting string

16
ChangeLog.pre-2-4
View File

@ -1,3 +1,19 @@
Mon May 6 11:48:08 2002 Owen Taylor <otaylor@redhat.com>
[ merged from stable ]
* Makefile.am (EXTRA_DIST): Add ChangeLog.pre-2-0 (#78641)
* m4macros/glib-2.0.m4: save CFLAGS/LIBS properly when
compiling "what went wrong" test case. (#79330)
* m4macros/glib-2.0.m4: Remove reference to editing
pkg-config script. (From Jim Gettys)
* configure.in: (Look for dyld interfaces before dlopen()
since OS X can have both. Patch from Jacob Berkman,
#80438)
2002-05-01 jacob berkman <jacob@ximian.com> 2002-05-01 jacob berkman <jacob@ximian.com>
* configure.in: fix typo on 64-bit printf formatting string * configure.in: fix typo on 64-bit printf formatting string

16
ChangeLog.pre-2-6
View File

@ -1,3 +1,19 @@
Mon May 6 11:48:08 2002 Owen Taylor <otaylor@redhat.com>
[ merged from stable ]
* Makefile.am (EXTRA_DIST): Add ChangeLog.pre-2-0 (#78641)
* m4macros/glib-2.0.m4: save CFLAGS/LIBS properly when
compiling "what went wrong" test case. (#79330)
* m4macros/glib-2.0.m4: Remove reference to editing
pkg-config script. (From Jim Gettys)
* configure.in: (Look for dyld interfaces before dlopen()
since OS X can have both. Patch from Jacob Berkman,
#80438)
2002-05-01 jacob berkman <jacob@ximian.com> 2002-05-01 jacob berkman <jacob@ximian.com>
* configure.in: fix typo on 64-bit printf formatting string * configure.in: fix typo on 64-bit printf formatting string

16
ChangeLog.pre-2-8
View File

@ -1,3 +1,19 @@
Mon May 6 11:48:08 2002 Owen Taylor <otaylor@redhat.com>
[ merged from stable ]
* Makefile.am (EXTRA_DIST): Add ChangeLog.pre-2-0 (#78641)
* m4macros/glib-2.0.m4: save CFLAGS/LIBS properly when
compiling "what went wrong" test case. (#79330)
* m4macros/glib-2.0.m4: Remove reference to editing
pkg-config script. (From Jim Gettys)
* configure.in: (Look for dyld interfaces before dlopen()
since OS X can have both. Patch from Jacob Berkman,
#80438)
2002-05-01 jacob berkman <jacob@ximian.com> 2002-05-01 jacob berkman <jacob@ximian.com>
* configure.in: fix typo on 64-bit printf formatting string * configure.in: fix typo on 64-bit printf formatting string

1
Makefile.am
View File

@ -10,6 +10,7 @@ INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@ \
-DG_DISABLE_DEPRECATED -DGLIB_COMPILATION -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION
EXTRA_DIST = \ EXTRA_DIST = \
ChangeLog.pre-2-0 \
ChangeLog.pre-1-2 \ ChangeLog.pre-1-2 \
glib.spec.in \ glib.spec.in \
glib-zip.in \ glib-zip.in \

14
configure.in
View File

@ -814,6 +814,13 @@ if test -z "$G_MODULE_IMPL" && test "x$glib_native_beos" = "xyes"; then
G_MODULE_IMPL=G_MODULE_IMPL_BEOS], G_MODULE_IMPL=G_MODULE_IMPL_BEOS],
[]) [])
fi fi
dnl *** NSLinkModule (dyld) in system libraries (Darwin)
if test -z "$G_MODULE_IMPL"; then
AC_CHECK_FUNC(NSLinkModule,
[G_MODULE_IMPL=G_MODULE_IMPL_DYLD
G_MODULE_NEED_USCORE=1],
[])
fi
dnl *** dlopen() and dlsym() in libdl dnl *** dlopen() and dlsym() in libdl
if test -z "$G_MODULE_IMPL"; then if test -z "$G_MODULE_IMPL"; then
AC_CHECK_LIB(dl, dlopen, AC_CHECK_LIB(dl, dlopen,
@ -822,13 +829,6 @@ if test -z "$G_MODULE_IMPL"; then
G_MODULE_IMPL=G_MODULE_IMPL_DL],[])], G_MODULE_IMPL=G_MODULE_IMPL_DL],[])],
[]) [])
fi fi
dnl *** NSLinkModule (dyld) in system libraries (Darwin)
if test -z "$G_MODULE_IMPL"; then
AC_CHECK_FUNC(NSLinkModule,
[G_MODULE_IMPL=G_MODULE_IMPL_DYLD
G_MODULE_NEED_USCORE=1],
[])
fi
dnl *** shl_load() in libdld (HP-UX) dnl *** shl_load() in libdld (HP-UX)
if test -z "$G_MODULE_IMPL"; then if test -z "$G_MODULE_IMPL"; then
AC_CHECK_LIB(dld, shl_load, AC_CHECK_LIB(dld, shl_load,

6
m4macros/glib-2.0.m4
View File

@ -173,6 +173,8 @@ main ()
: :
else else
echo "*** Could not run GLIB test program, checking why..." echo "*** Could not run GLIB test program, checking why..."
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GLIB_CFLAGS" CFLAGS="$CFLAGS $GLIB_CFLAGS"
LIBS="$LIBS $GLIB_LIBS" LIBS="$LIBS $GLIB_LIBS"
AC_TRY_LINK([ AC_TRY_LINK([
@ -189,9 +191,7 @@ main ()
echo "*** If you have an old version installed, it is best to remove it, although" echo "*** If you have an old version installed, it is best to remove it, although"
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
[ echo "*** The test program failed to compile or link. See the file config.log for the" [ echo "*** The test program failed to compile or link. See the file config.log for the"
echo "*** exact error that occured. This usually means GLIB was incorrectly installed" echo "*** exact error that occured. This usually means GLIB is incorrectly installed."])
echo "*** or that you have moved GLIB since it was installed. In the latter case, you"
echo "*** may want to edit the pkg-config script: $PKG_CONFIG" ])
CFLAGS="$ac_save_CFLAGS" CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS" LIBS="$ac_save_LIBS"
fi fi