Changeset 1339

Timestamp:

11/10/07 10:39:01 (1 year ago)

Author:

glslang

Message:

+ removes rpath references and png fixes for leopard when X11 is installed

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• m4/boost.m4 (modified) (2 diffs)
• m4/glew.m4 (modified) (3 diffs)
• m4/openal.m4 (modified) (2 diffs)
• m4/openimagelib.m4 (modified) (2 diffs)
• m4/qt.m4 (modified) (2 diffs)
• openlibraries.pc.in (modified) (1 diff)
• src/openimagelib/plugins/png/Makefile.am (modified) (2 diffs)

trunk/configure.ac

@@ -348 +348 @@
 AC_SUBST(OPENPLUGINLIB_LIBPATH)
 
-#
-# RPATHS
-#
-
-case $host in
-        *-*-linux*)
-                OPENPLUGINLIB_RPATH="-Wl,-rpath=${OPENLIBRARIES_LIBPATH}/openpluginlib/$OL_LIBNAME"
-                OPENIMAGELIB_RPATH="-Wl,-rpath=${OPENLIBRARIES_LIBPATH}/openimagelib/$OL_LIBNAME"
-                OPENMEDIALIB_RPATH="-Wl,-rpath=${OPENLIBRARIES_LIBPATH}/openmedialib/$OL_LIBNAME"
-                OPENOBJECTLIB_RPATH="-Wl,-rpath=${OPENLIBRARIES_LIBPATH}/openobjectlib/$OL_LIBNAME"
-                OPENASSETLIB_RPATH="-Wl,-rpath=${OPENLIBRARIES_LIBPATH}/openassetlib/$OL_LIBNAME"
-        ;;
-        *)
-                OPENPLUGINLIB_RPATH=""
-                OPENIMAGELIB_RPATH=""
-                OPENMEDIALIB_RPATH=""
-                OPENOBJECTLIB_RPATH=""
-                OPENASSETLIB_RPATH=""
-        ;;
-esac
-
 dnl pkg config link flags
 OPENOBJECTLIB_LDFLAGS=""
 if test "x$enableobjectlib" = "xyes" && test "x$enableglew" = "xyes" ; then
-        OPENOBJECTLIB_LDFLAGS="$OPENOBJECTLIB_RPATH -L$OPENLIBRARIES_LIBPATH/openobjectlib/$OL_LIBNAME -lopenobjectlib_sg"
-else
-        OPENOBJECTLIB_RPATH=""
-fi
-AC_SUBST(OPENPLUGINLIB_RPATH)
+        OPENOBJECTLIB_LDFLAGS="-L$OPENLIBRARIES_LIBPATH/openobjectlib/$OL_LIBNAME -lopenobjectlib_sg"
+fi
 AC_SUBST(OPENOBJECTLIB_LDFLAGS)
 
 OPENASSETLIB_LDFLAGS=""
 if test "x$enableassetlib" = "xyes" && test "x$enableglew" = "xyes" ; then
-        OPENASSETLIB_LDFLAGS="$OPENASSETLIB_RPATH -L$OPENLIBRARIES_LIBPATH/openassetlib/$OL_LIBNAME -lopenassetlib_al"
-else
-        OPENASSETLIB_RPATH=""
-fi
-AC_SUBST(OPENASSETLIB_RPATH)
+        OPENASSETLIB_LDFLAGS="-L$OPENLIBRARIES_LIBPATH/openassetlib/$OL_LIBNAME -lopenassetlib_al"
+fi
 AC_SUBST(OPENASSETLIB_LDFLAGS)
 
-OPENMEDIALIB_LDFLAGS="$OPENMEDIALIB_RPATH -L$OPENLIBRARIES_LIBPATH/openmedialib/$OL_LIBNAME -lopenmedialib_ml"
+OPENMEDIALIB_LDFLAGS="-L$OPENLIBRARIES_LIBPATH/openmedialib/$OL_LIBNAME -lopenmedialib_ml"
 AC_SUBST(OPENMEDIALIB_LDFLAGS)
 
-OPENIMAGELIB_LDFLAGS="$OPENIMAGELIB_RPATH -L$OPENLIBRARIES_LIBPATH/openimagelib/$OL_LIBNAME -lopenimagelib_il"
+OPENIMAGELIB_LDFLAGS="-L$OPENLIBRARIES_LIBPATH/openimagelib/$OL_LIBNAME -lopenimagelib_il"
 AC_SUBST(OPENIMAGELIB_LDFLAGS)
 
-OPENPLUGINLIB_LDFLAGS="$OPENPLUGINLIB_RPATH -L$OPENLIBRARIES_LIBPATH/openpluginlib/$OL_LIBNAME -lopenpluginlib_pl"
+OPENPLUGINLIB_LDFLAGS="-L$OPENLIBRARIES_LIBPATH/openpluginlib/$OL_LIBNAME -lopenpluginlib_pl"
 AC_SUBST(OPENPLUGINLIB_LDFLAGS)
-
-AC_SUBST(OPENIMAGELIB_RPATH)
-AC_SUBST(OPENMEDIALIB_RPATH)
-AC_SUBST(OPENOBJECTLIB_RPATH)
-AC_SUBST(OPENASSETLIB_RPATH)
 
 dnl

trunk/m4/boost.m4

@@ -49 +49 @@
         ,,)
 
-        BOOST_LIB_RPATH=""
-
-        if test "x$with_boostprefix" != "x" ; then
-                case $host in
-                        *-*-linux*)
-                                BOOST_LIB_RPATH="-Wl,-rpath=$with_boostprefix/$OL_LIBNAME"
-                        ;;
-                esac
-        fi
-
         BOOST_LIBNAMESUFFIX="$BOOST_LIB_TOOLSET$BOOST_LIB_RUNTIME$BOOST_LIB_VERSION"
 
@@ -96 +86 @@
         AC_SUBST(BOOST_INCLUDE_PATH)
         AC_SUBST(BOOST_LIB_PATH)
-        AC_SUBST(BOOST_LIB_RPATH)
 
         AC_SUBST(BOOST_FILESYSTEM_LIBS)

trunk/m4/glew.m4

@@ -11 +11 @@
         GLEW_INCLUDE_PATH=""
         GLEW_LIB_PATH=""
-        GLEW_LIB_RPATH=""
         GLEW_LIBS=""
 
@@ -32 +31 @@
                         [AC_MSG_ERROR([*** GLEW support is not available. Please install GLEW to proceed. ***])])]
 
-                LDFLAGS="$save_LDFLAGS", [AC_MSG_ERROR([*** GLEW support is not available. Please install GLEW to proceed. ***])],[])
-                                    
-                if test x$ac_have_glew = "xyes"; then
-                        ac_use_glew=yes
-                        if test "x$with_glewprefix" != "x" ; then
-                                case $host in
-                                        *-*-linux*)
-                                                GLEW_LIB_RPATH="-Wl,-rpath=$with_glewprefix/$OL_LIBNAME"
-                                esac
-                        fi
-                fi
+                LDFLAGS="$save_LDFLAGS", [AC_MSG_ERROR([*** GLEW support is not available. Please install GLEW to proceed. ***])],[])                               
         fi
         
@@ -48 +37 @@
         AC_SUBST(GLEW_INCLUDE_PATH)
         AC_SUBST(GLEW_LIB_PATH)
-        AC_SUBST(GLEW_LIB_RPATH)
         AC_SUBST(GLEW_LIBS)
 

trunk/m4/openal.m4

@@ -19 +19 @@
         OPENAL_INCLUDE_PATH=""
         OPENAL_LIB_PATH=""
-        OPENAL_LIB_RPATH=""
         OPENAL_LIBS=""
 
@@ -67 +66 @@
         AC_SUBST(OPENAL_INCLUDE_PATH)
         AC_SUBST(OPENAL_LIB_PATH)
-        AC_SUBST(OPENAL_LIB_RPATH)
         AC_SUBST(OPENAL_LIBS)
         AM_CONDITIONAL(HAVE_OPENAL, [test x$ac_use_openal = "xyes"])

trunk/m4/openimagelib.m4

@@ -22 +22 @@
                 else
                         PNG_CFLAGS=`$LIBPNG_CONFIG --cflags`
-                        PNG_LIBS=`$LIBPNG_CONFIG --libs`
+                        PNG_LDFLAGS=`$LIBPNG_CONFIG --ldflags`
                         have_libpng="yes"
                         AC_DEFINE(HAVE_LIBPNG,1,[Define this for PNG support])
@@ -29 +29 @@
                 AM_CONDITIONAL(HAVE_LIBPNG, test x"$have_libpng" = "xyes")
                 AC_SUBST(PNG_CFLAGS)
-                AC_SUBST(PNG_LIBS)
+                AC_SUBST(PNG_LDFLAGS)
 
                 dnl libjpeg support

trunk/m4/qt.m4

@@ -10 +10 @@
         QT_INCLUDE_PATH="-I${with_qtinclude}"
         QT_LIB_PATH="-L${with_qtlib}"
-        QT_LIB_RPATH=""
         QT_LIBS=""
 
@@ -53 +52 @@
         AC_SUBST(QT_INCLUDE_PATH)
         AC_SUBST(QT_LIB_PATH)
-        AC_SUBST(QT_LIB_RPATH)
         AC_SUBST(QT_LIBS)
         AM_CONDITIONAL(HAVE_QT, [test x$ac_use_qt = "xyes"])

trunk/openlibraries.pc.in

@@ -19 +19 @@
 Version: @OL_MAJOR@.@OL_MINOR@.@OL_SUB@
 
-Libs: @OPENPLUGINLIB_RPATH@ @OPENIMAGELIB_RPATH@ @OPENMEDIALIB_RPATH@ @OPENOBJECTLIB_RPATH@ \
-          @OPENASSETLIB_RPATH@ @BOOST_LIB_RPATH@ @GLEW_LIB_RPATH@       \
-         -L${libdir}/openlibraries-@OL_MAJOR@.@OL_MINOR@.@OL_SUB@/openobjectlib/@OL_LIBNAME@ -lopenobjectlib_sg \
+Libs: -L${libdir}/openlibraries-@OL_MAJOR@.@OL_MINOR@.@OL_SUB@/openobjectlib/@OL_LIBNAME@ -lopenobjectlib_sg \
          -L${libdir}/openlibraries-@OL_MAJOR@.@OL_MINOR@.@OL_SUB@/openimagelib/@OL_LIBNAME@ -lopenimagelib_il \
          -L${libdir}/openlibraries-@OL_MAJOR@.@OL_MINOR@.@OL_SUB@/openmedialib/@OL_LIBNAME@ -lopenmedialib_ml \

trunk/src/openimagelib/plugins/png/Makefile.am

@@ -14 +14 @@
 libopenimagelib_png_la_CXXFLAGS = \
         $(OLIB_CXXFLAGS) \
+        $(PNG_CFLAGS) \
         $(BOOST_INCLUDE_PATH)   \
         -DIL_EXPORTS
@@ -19 +20 @@
 libopenimagelib_png_la_LIBADD = \
         $(top_builddir)/src/openpluginlib/pl/libopenpluginlib_pl.la \
-        $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la \
-        $(PNG_LIBS)
+        $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la
 
 libopenimagelib_png_la_LDFLAGS = \
         $(OLIB_LDFLAGS)                                                 \
+        $(PNG_LDFLAGS)  \
         $(BOOST_LIB_PATH)                        \
         -version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE)