]> granicus.if.org Git - graphviz/commitdiff
support --disable-static and use in .spec for rpms
authorellson <devnull@localhost>
Tue, 18 Oct 2005 18:28:01 +0000 (18:28 +0000)
committerellson <devnull@localhost>
Tue, 18 Oct 2005 18:28:01 +0000 (18:28 +0000)
cmd/dot/Makefile.am
configure.ac
graphviz.spec.in

index 782d05edd2f6448b220ffea91a16ba40fa790911..1e0c46895cccf1d17c668055620aaba2b8c8e341 100644 (file)
@@ -13,8 +13,11 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/lib/graph \
        -I$(top_srcdir)/lib/cdt
 
+if ENABLE_STATIC
+bin_PROGRAMS = dot dot_static
+else
 bin_PROGRAMS = dot
-noinst_PROGRAMS = dot_static
+endif
 man_MANS = dot.1 
 pdf_DATA = dot.pdf
 
index 483aa21d32b13b58ae6b4c7f19b13dbaf21eae6c..6f7db9cab743e13dff9973ba4474d42803f15055 100644 (file)
@@ -88,16 +88,14 @@ fi
 dnl -----------------------------------
 # Static binaries 
 
-# Always enable static as dot_static makes it so much easier to debug
-
-#AC_ARG_ENABLE(static,
-#        [AC_HELP_STRING([--enable-codegens], [build static executable])])
-#if test "x$enable_static" = "xyes"; then
-#      AC_DEFINE(ENABLE_STATIC,1,[Define if you want statically linked executables])
-#else
-#      AC_DISABLE_STATIC
-#fi
-#AM_CONDITIONAL(ENABLE_STATIC, [test "x$enable_static" = "xyes"])
+AC_ARG_ENABLE(static,
+        [AC_HELP_STRING([--enable-static], [build static executable])])
+if test "x$enable_static" != "xno"; then
+       AC_DEFINE(ENABLE_STATIC,1,[Define if you want statically linked executables])
+else
+       AC_DISABLE_STATIC
+fi
+AM_CONDITIONAL(ENABLE_STATIC, [test "x$enable_static" != "xno"])
 
 dnl -----------------------------------
 dnl checks for compilers
index 05ecc659bef579f25895e58a1a4d2a5ac042f7cb..7ec9d57ac31ca7cc991ee8dcbbdd4bd55201d1f5 100644 (file)
@@ -92,6 +92,7 @@ CFLAGS="$RPM_OPT_FLAGS" \
       --mandir=%{_mandir} \
       --with-x \
       --with-mylibgd \
+      --disable-static \
       --disable-dependency-tracking
 %__make %{?_smp_mflags}