Merge pull request #567 from Reinis/wxmacmolplt

sci-chemistry/wxmacmolplt: Use pkg-config to get link flags

2 files changed, 92 insertions, 0 deletions

diff --git a/sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.6.1-pkg_config.patch b/sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.6.1-pkg_config.patch
new file mode 100644
index 000000000..d2d79ee1e
--- /dev/null
+++ b/sci-chemistry/wxmacmolplt/files/wxmacmolplt-7.6.1-pkg_config.patch
@@ -0,0 +1,90 @@
+diff --git a/configure.ac b/configure.ac
+index ef3f90f..abec341 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -7,24 +7,24 @@ dnl AC_REVISION
+ AM_MAINTAINER_MODE
+ 
+ AC_CANONICAL_HOST
+-LIBGL=
++GLU_LIBS=
+ HOST=
+ case "${host}" in
+    *msvc*)
+       HOST=MSW 
+-      LIBGL="-lopengl32 -lglu32"
++      GLU_LIBS="-lopengl32 -lglu32"
+       ;;
+    *darwin*)
+       HOST=OSX 
+-      LIBGL="-framework OpenGL"
++      GLU_LIBS="-framework OpenGL"
+       ;;
+    *)
+       HOST=LINUX
+-      LIBGL="-lGL -lGLU"
++      PKG_CHECK_MODULES([GLU], [glu], [], [GLU_LIBS="-lGL -lGLU"])
+       ;;
+ esac
+ AM_CONDITIONAL(HOST_IS_MSW, [test "x$HOST" == xMSW])
+-AC_SUBST([LIBGL])
++AC_SUBST([GLU_LIBS])
+ 
+ #
+ # There isn't a reliable way to know we should use the Apple OpenGL framework
+@@ -53,30 +53,37 @@ AC_ARG_WITH(ming,
+                           using the ming library; (default=yes)]],
+ [],
+ [with_ming=yes])
+-LIBMING=
++
++MING_LIBS=
++
+ AS_IF([test "x$with_ming" != xno],
+ [AC_CHECK_LIB([ming], [Ming_init],
+-    [AC_SUBST([LIBMING], ["-lming"]) AC_DEFINE([HAVE_LIBMING])],
++    [PKG_CHECK_MODULES([MING], [libming], [], [MING_LIBS="-lming"])
++     AC_DEFINE([HAVE_LIBMING])],
+     [if test "x$with_ming" != xyes ; then
+         AC_MSG_FAILURE([--with-ming was given, but test for ming failed])
+     fi], -lpng)])
+ 
++AC_SUBST([MING_LIBS])
++
+ AC_ARG_WITH(glew,
+ [[  --with-glew             Use the system provided glew library instead of 
+                           the built-in version; (default=yes if present)]],
+ [],
+ [with_glew=check])
+ 
+-LIBGLEW=
++GLEW_LIBS=
+ 
+ AS_IF([test "x$with_glew" != xno],
+       [AC_CHECK_LIB([GLEW], [glewInit],
+-    [AC_SUBST([LIBGLEW], ["-lGLEW"]) AC_DEFINE([SYSTEM_GLEW])],
++    [PKG_CHECK_MODULES([GLEW], [glew], [], [GLEW_LIBS="-lGLEW"])
++     AC_DEFINE([SYSTEM_GLEW])],
+     [if test "x$with_glew" = xyes; then
+         AC_MSG_FAILURE([--with-glew was given, but test for glew failed])
+     fi])])
+ 
+-AM_CONDITIONAL([SYSTEM_GLEW], [test $LIBGLEW = "-lGLEW"])
++AM_CONDITIONAL([SYSTEM_GLEW], [test "x$ac_cv_lib_GLEW_glewInit" = xyes])
++AC_SUBST([GLEW_LIBS])
+ 
+ WXCONFIG=wx-config
+ AC_ARG_WITH(wx-config,
+diff --git a/src/Makefile.am b/src/Makefile.am
+index a666aff..0a88493 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -80,7 +80,7 @@ wxmacmolplt_SOURCES += glew.cpp glew.h glxew.h wglew.h
+ endif
+ 
+ AM_CXXFLAGS = $(WX_CXXFLAGS)
+-wxmacmolplt_LDADD = $(WX_LIBS) $(LIBMING) $(LIBGL) $(LIBGLEW)
++wxmacmolplt_LDADD = $(WX_LIBS) $(MING_LIBS) $(GLU_LIBS) $(GLEW_LIBS)
+ wxmacmolplt_LDFLAGS = $(WX_CXXFLAGS)
+ EXTRA_DIST = wxMacMolPlt.pjd xpms/arrow.xpm \
+ 	xpms/hand.xpm xpms/rect_lasso.xpm xpms/view.xpm
diff --git a/sci-chemistry/wxmacmolplt/wxmacmolplt-7.6.1.ebuild b/sci-chemistry/wxmacmolplt/wxmacmolplt-7.6.1.ebuild
index 028ff6f62..cf7c2cd11 100644
--- a/sci-chemistry/wxmacmolplt/wxmacmolplt-7.6.1.ebuild
+++ b/sci-chemistry/wxmacmolplt/wxmacmolplt-7.6.1.ebuild
@@ -26,6 +26,8 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-pkg_config.patch
+
 	epatch_user
 
 	sed \