projects / platform / upstream / glib.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a7b7ff8)
[ merged from stable ]
authorOwen Taylor <otaylor@redhat.com>
Mon, 6 May 2002 16:07:03 +0000 (16:07 +0000)
committerOwen Taylor <otaylor@src.gnome.org>
Mon, 6 May 2002 16:07:03 +0000 (16:07 +0000)
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)

ChangeLog patch | blob | history
ChangeLog.pre-2-10 patch | blob | history
ChangeLog.pre-2-12 patch | blob | history
ChangeLog.pre-2-2 patch | blob | history
ChangeLog.pre-2-4 patch | blob | history
ChangeLog.pre-2-6 patch | blob | history
ChangeLog.pre-2-8 patch | blob | history
Makefile.am patch | blob | history
configure.in patch | blob | history
m4macros/glib-2.0.m4 patch | blob | history

diff --git a/ChangeLog b/ChangeLog
index f0832fe..a41cc63 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * configure.in: fix typo on 64-bit printf formatting string
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f0832fe..a41cc63 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -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>
 
        * configure.in: fix typo on 64-bit printf formatting string
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index f0832fe..a41cc63 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -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>
 
        * configure.in: fix typo on 64-bit printf formatting string
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index f0832fe..a41cc63 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -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>
 
        * configure.in: fix typo on 64-bit printf formatting string
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index f0832fe..a41cc63 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -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>
 
        * configure.in: fix typo on 64-bit printf formatting string
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index f0832fe..a41cc63 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -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>
 
        * configure.in: fix typo on 64-bit printf formatting string
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index f0832fe..a41cc63 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -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>
 
        * configure.in: fix typo on 64-bit printf formatting string
diff --git a/Makefile.am b/Makefile.am
index 76768e6..b8eae80 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -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-0       \
        ChangeLog.pre-1-2       \
        glib.spec.in            \
        glib-zip.in             \
diff --git a/configure.in b/configure.in
index 78aa75e..bc57877 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -814,6 +814,13 @@ if test -z "$G_MODULE_IMPL" && test "x$glib_native_beos" = "xyes"; then
       G_MODULE_IMPL=G_MODULE_IMPL_BEOS],
       [])
 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
 if test -z "$G_MODULE_IMPL"; then
        AC_CHECK_LIB(dl, dlopen,
@@ -822,13 +829,6 @@ if test -z "$G_MODULE_IMPL"; then
                                   G_MODULE_IMPL=G_MODULE_IMPL_DL],[])],
                     [])
 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)
 if test -z "$G_MODULE_IMPL"; then
        AC_CHECK_LIB(dld, shl_load,
diff --git a/m4macros/glib-2.0.m4 b/m4macros/glib-2.0.m4
index 0c1ae85..28ccef4 100644 (file)
--- a/m4macros/glib-2.0.m4
+++ b/m4macros/glib-2.0.m4
@@ -173,6 +173,8 @@ main ()
         :
        else
           echo "*** Could not run GLIB test program, checking why..."
+          ac_save_CFLAGS="$CFLAGS"
+          ac_save_LIBS="$LIBS"
           CFLAGS="$CFLAGS $GLIB_CFLAGS"
           LIBS="$LIBS $GLIB_LIBS"
           AC_TRY_LINK([
@@ -189,9 +191,7 @@ main ()
           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 "*** 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 "*** 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" ])
+          echo "*** exact error that occured. This usually means GLIB is incorrectly installed."])
           CFLAGS="$ac_save_CFLAGS"
           LIBS="$ac_save_LIBS"
        fi
Domain: System / Base;