babl r278 - in trunk: . extensions

[ok svn gnome org]

Author: ok
Date: Fri Feb 15 21:24:13 2008
New Revision: 278
URL: http://svn.gnome.org/viewvc/babl?rev=278&view=rev

Log:
* configure.ac: cleaned up win32 detection vs plug-in compilation
specifics, added DYNAMICLIB paramter for gcc which defaults to -shared
for win32 and -dynamiclib for darwin.
* extensions/Makefile.am: use $(DYNAMICLIB) instead of -shared.


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/extensions/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Fri Feb 15 21:24:13 2008
@@ -155,23 +155,47 @@
 esac
 
 
+####################################################
+# Check how to generate plug-ins (with gcc at least)
+####################################################
+
+AC_MSG_CHECKING([for some Win32 platform])
+case "$target_or_host" in 
+  *-*-darwin*)                 # darwin
+    shrext=.dylib
+    dynamiclib=-dynamiclib
+    ;;
+  *-*-mingw* | *-*-cygwin*)    # windows
+    shrext=.dll
+    dynamiclib=-shared
+    ;;
+  *)                           # linux (and BSD?)
+    dynamiclib=-shared
+    shrext=.so
+    ;;
+esac
+
+SHREXT=$shrext
+AC_SUBST(SHREXT)
+AC_DEFINE_UNQUOTED(SHREXT,     "$shrext",     [File extension for shared libraries])
+
+DYNAMICLIB=$dynamiclib
+AC_SUBST(DYNAMICLIB)
+AC_DEFINE_UNQUOTED(DYNAMICLIB, "$dynamiclib", [Dynamic shared library])
+
+dnl ===========================================================================
+
 #################
 # Check for Win32
 #################
 
 AC_MSG_CHECKING([for some Win32 platform])
 case "$target_or_host" in 
-  *-*-darwin*)
-    platform_win32=no
-    shrext=.dylib
-    ;;
   *-*-mingw* | *-*-cygwin*)
     platform_win32=yes
-    shrext=.dll
     ;;
   *)
     platform_win32=no
-    shrext=.so
     ;;
 esac
 AC_MSG_RESULT([$platform_win32])
@@ -214,15 +238,6 @@
 
 AC_DEFINE_UNQUOTED(BABL_LIBRARY, "$PACKAGE_NAME-$BABL_API_VERSION", [name of BABL library])
 
-#####################################
-# File extension for shared libraries
-#####################################
-
-SHREXT=$shrext
-AC_SUBST(SHREXT)
-AC_DEFINE_UNQUOTED(SHREXT, "$shrext", [File extension for shared libraries])
-
-dnl ===========================================================================
 
 
 dnl ===========================================================================

Modified: trunk/extensions/Makefile.am
==============================================================================
--- trunk/extensions/Makefile.am	(original)
+++ trunk/extensions/Makefile.am	Fri Feb 15 21:24:13 2008
@@ -19,7 +19,7 @@
 	-I $(top_srcdir)/extensions	\
 	-fPIC
 
-LDFLAGS += -shared
+LDFLAGS += $(DYNAMICLIB)
 
 if OS_WIN32
 LDADD    = $(no-undefined) $(libbabldlla) $(MATH_LIB)