[Gnash-commit] gnash ChangeLog macros/boost.m4 macros/x11.m4

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/05/17 18:28:00

Modified files:
        .              : ChangeLog 
        macros         : boost.m4 x11.m4 

Log message:
                * macros/: boost.m4, x11.m4: avoid explicit -L/usr/lib.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3253&r2=1.3254
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/boost.m4?cvsroot=gnash&r1=1.45&r2=1.46
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/x11.m4?cvsroot=gnash&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3253
retrieving revision 1.3254
diff -u -b -r1.3253 -r1.3254
--- ChangeLog   17 May 2007 16:53:25 -0000      1.3253
+++ ChangeLog   17 May 2007 18:27:59 -0000      1.3254
@@ -1,11 +1,12 @@
+2007-05-17 Sandro Santilli <address@hidden>
+
+       * macros/: boost.m4, x11.m4: avoid explicit -L/usr/lib.
+
 2007-05-17  Rob Savoye  <address@hidden>
 
        * libbase/Makefile.am: Add ltdl.h to noinst_HEADERS.
-
        * po/Makefile.am: Use DESTDIR when installing. 
-
-       * testsuite/server/Makefile.am: Link in FFMPEG is configured to do
-       so.
+       * testsuite/server/Makefile.am: Link in FFMPEG is configured to do so.
        * libbase/Makefile.am: Add path for ltdl.h.
 
 2007-05-17 Markus Gothe <address@hidden>

Index: macros/boost.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/boost.m4,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- macros/boost.m4     16 May 2007 19:58:55 -0000      1.45
+++ macros/boost.m4     17 May 2007 18:28:00 -0000      1.46
@@ -14,7 +14,7 @@
 dnl  along with this program; if not, write to the Free Software
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-dnl $Id: boost.m4,v 1.45 2007/05/16 19:58:55 rsavoye Exp $
+dnl $Id: boost.m4,v 1.46 2007/05/17 18:28:00 strk Exp $
 
 dnl Boost modules are:
 dnl date-time, filesystem. graph. iostreams, program options, python,
@@ -114,7 +114,11 @@
           lfile="${lfile}-mt"
         fi
         boost_date_time=yes
+       if test x"${ldir}" != "x/usr/lib"; then
         ac_cv_path_boost_lib="-L${ldir} -l${lfile}"
+       else
+               ac_cv_path_boost_lib="-l${lfile}"
+       fi
         break
       else
         break

Index: macros/x11.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/x11.m4,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- macros/x11.m4       11 May 2007 14:20:00 -0000      1.7
+++ macros/x11.m4       17 May 2007 18:28:00 -0000      1.8
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
-dnl $Id: x11.m4,v 1.7 2007/05/11 14:20:00 rsavoye Exp $
+dnl $Id: x11.m4,v 1.8 2007/05/17 18:28:00 strk Exp $
 
 AC_DEFUN([GNASH_PATH_X11],
 [
@@ -71,7 +71,11 @@
     newlist="/Developer/SDKs/MacOSX10.4*.sdk/usr/lib 
/Developer/SDKs/MacOSX10.4*.sdk/usr/X11R6/lib ${libslist}"
     for i in $newlist; do
      if test -f $i/libX11.a -o -f $i/libX11.${shlibext}; then
+       if "x${i}" != "x/usr/lib"; then
        ac_cv_path_x11_lib="-L$i -lX11"
+       else
+         ac_cv_path_x11_lib="-lX11"
+       fi
         if test -f $i/libXinerama.a -o -f $i/libXinerama.${shlibext}; then
           ac_cv_path_x11_lib="${ac_cv_path_x11_lib} -lXinerama"
         fi
@@ -91,7 +95,11 @@
 
   for i in $newlist; do
     if test -f $i/libXplugin.a -o -f $i/libXplugin.${shlibext}; then
+      if "x${i}" != "x/usr/lib"; then
       ac_cv_path_x11_lib="${ac_cv_path_x11_lib} -L$i -lXplugin"
+      else
+        ac_cv_path_x11_lib="${ac_cv_path_x11_lib} -lXplugin"
+      fi
       break
     fi
   done