File fltk-flu-disable_static.patch of Package fltk-flu

Index: configure
===================================================================
--- configure.orig	2004-10-26 17:09:51.000000000 +0200
+++ configure	2011-02-28 13:02:17.048591978 +0100
@@ -28,6 +28,7 @@ echo "$CONF_VERSION"
 ENABLE_EXAMPLES=0
 ENABLE_DEBUG=0
 ENABLE_SHARED=1
+ENABLE_STATIC=1
 ENABLE_GL=1
 CYGWIN=0
 MINGW=0
@@ -251,6 +252,9 @@ do
       "--disable-shared")
 	  ENABLE_SHARED=0
 	  ;;
+      "--disable-static")
+	  ENABLE_STATIC=0
+	  ;;
       "--enable-debug")
 	  ENABLE_DEBUG=1
 	  ;;
@@ -384,6 +388,8 @@ echo "VERSION = $FLU_VERSION" >> makeinc
 echo "ENABLE_SHARED = $ENABLE_SHARED" >> makeinclude
 echo "ENABLE_GL = $ENABLE_GL" >> makeinclude
 
+echo "ENABLE_STATIC = $ENABLE_STATIC" >> makeinclude
+
 if test $ENABLE_DEBUG -eq 1 
 then
     CXXFLAGS=$CXXFLAGS" -g"
@@ -568,6 +574,8 @@ echo "Creating flu-config..."
 echo "#!/bin/$MY_SHELL"  > flu-config
 echo "# generated on $date by $CONF_VERSION" >> flu-config
 
+
+
 echo '
 
 print_help_and_exit()
@@ -579,10 +587,15 @@ Options:
   --local                use local build instead of system install
   --use-gl               use OpenGL
   --cxxflags             return flags to compile against FLU using C++
-  --ldflags              return flags to link against FLU
-  --ldstaticflags        return flags to link against static FLU libs
+  --ldflags              return flags to link against FLU' >> flu-config
+
+if [ $ENABLE_STATIC -eq 1 ]; then
+echo '--ldstaticflags        return flags to link against static FLU libs
                               even if DSOs are installed
-  --libs                 return the necessary libs to link to FLU
+' >> flu-config
+fi
+
+echo '  --libs                 return the necessary libs to link to FLU
 "
 exit
 }
@@ -657,15 +670,23 @@ do
 	    echo -n '-I$PREFIX/include' `$FLTK_CONFIG $USE_GL --cxxflags`
           fi
 	  ;;
-      "--ldstaticflags")
-          if test $LOCAL -eq 1
+      "--ldstaticflags")' >> flu-config
+
+if [ $ENABLE_STATIC -eq 1 ]; then
+echo '          if test $LOCAL -eq 1
           then
             echo -n '-L$BASE/lib' '-L$LOCAL_FLTK'lib $GL_LIB -lflu `$FLTK_CONFIG $USE_GL --ldflags`
           else
             echo -n $GL_LIB '$LPREFIX/libflu.a' `$FLTK_CONFIG $USE_GL --ldstaticflags`
           fi
-	  ;;
-      "--ldflags")
+	  ;;' >> flu-config
+else
+echo '            echo "The static libraries were disabled at build time. Please link dynamically"
+            exit 1
+      ;;' >> flu-config
+fi
+
+echo '      "--ldflags")
           if test $LOCAL -eq 1
           then
             echo -n '-L$BASE/src' '-L$LOCAL_FLTK'src $GL_DSO -lflu `$FLTK_CONFIG $USE_GL --ldflags`
Index: src/Makefile
===================================================================
--- src/Makefile.orig	2004-09-23 21:24:39.000000000 +0200
+++ src/Makefile	2011-02-28 12:48:25.569043745 +0100
@@ -53,12 +53,16 @@ GL_SHARED_LINK = libflu_gl.$(SHARED_EXT)
 GL_SHARED_LIB = $(GL_SHARED_LINK).$(VERSION)
 GL_STATIC_LIB = libflu_gl.a
 
-LIBS = $(STATIC_LIB)
+ifeq ($(ENABLE_STATIC),1)
+	LIBS += $(STATIC_LIB)
+endif
 ifeq ($(ENABLE_SHARED),1)
 	LIBS += $(SHARED_LIB)
 endif
 ifeq ($(ENABLE_GL),1)
-	LIBS += $(GL_STATIC_LIB)
+        ifeq ($(ENABLE_STATIC),1)
+		LIBS += $(GL_STATIC_LIB)
+	endif
 	ifeq ($(ENABLE_SHARED),1)
 		LIBS += $(GL_SHARED_LIB)
 	endif
openSUSE Build Service is sponsored by