[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: branches/KDE/3.5/kdesdk/umbrello
From: Jonathan Riddell <jr () jriddell ! org>
Date: 2005-09-13 1:00:31
Message-ID: 1126573231.555962.17311.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 460112 by jriddell:
Comment out autolayout again in configure.in.in, it was breaking compile for people \
who had graphviz installed.
M +16 -16 configure.in.in
M +2 -1 umbrello/Makefile.am
--- branches/KDE/3.5/kdesdk/umbrello/configure.in.in #460111:460112
@@ -9,22 +9,22 @@
fi
dnl Not GPL compatible
-AC_PATH_PROG(DOT_FOUND, dot, no)
-KDE_CHECK_HEADER(graphviz/pathgeom.h,
- [kde_have_graphviz=yes],
- [kde_have_graphviz=no])
-
-if test "$DOT_FOUND" != "no" -a "$kde_have_graphviz" = "yes"; then
- CXXFLAGS="$CXXFLAGS -DHAVE_DOT"
- GRAPHVIZ_LIB=`pkg-config --libs libgraph`
- AUTOLAYOUT_DIR="autolayout"
- AUTOLAYOUT_LIBS="autolayout/libautolayout.la $GRAPHVIZ_LIB -ldotgen -lgvc"
-else
- AUTOLAYOUT_DIR=""
- AUTOLAYOUT_LIBS=""
-fi
-AC_SUBST(AUTOLAYOUT_DIR)
-AC_SUBST(AUTOLAYOUT_LIBS)
+dnl AC_PATH_PROG(DOT_FOUND, dot, no)
+dnl KDE_CHECK_HEADER(graphviz/pathgeom.h,
+dnl [kde_have_graphviz=yes],
+dnl [kde_have_graphviz=no])
+dnl
+dnl if test "$DOT_FOUND" != "no" -a "$kde_have_graphviz" = "yes"; then
+dnl CXXFLAGS="$CXXFLAGS -DHAVE_DOT"
+dnl GRAPHVIZ_LIB=`pkg-config --libs libgraph`
+dnl AUTOLAYOUT_DIR="autolayout"
+dnl AUTOLAYOUT_LIBS="autolayout/libautolayout.la $GRAPHVIZ_LIB -ldotgen -lgvc"
+dnl else
+dnl AUTOLAYOUT_DIR=""
+dnl AUTOLAYOUT_LIBS=""
+dnl fi
+dnl AC_SUBST(AUTOLAYOUT_DIR)
+dnl AC_SUBST(AUTOLAYOUT_LIBS)
dnl End of Not GPL compatible
AC_LANG_RESTORE
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/Makefile.am #460111:460112
@@ -104,7 +104,8 @@
widget_utils.cpp \
worktoolbar.cpp
-umbrello_LDADD = ./refactoring/librefactoring.la ./classparser/libclassparser.la \
./clipboard/libclipboard.la ./dialogs/libdialogs.la \
./codegenerators/libcodegenerator.la $(AUTOLAYOUT_LIBS) $(LIB_KDEPRINT) $(LIB_KIO) \
+#umbrello_LDADD = ./refactoring/librefactoring.la ./classparser/libclassparser.la \
./clipboard/libclipboard.la ./dialogs/libdialogs.la \
./codegenerators/libcodegenerator.la $(AUTOLAYOUT_LIBS) $(LIB_KDEPRINT) $(LIB_KIO) \
+umbrello_LDADD = ./refactoring/librefactoring.la ./classparser/libclassparser.la \
./clipboard/libclipboard.la ./dialogs/libdialogs.la \
./codegenerators/libcodegenerator.la $(LIB_KDEPRINT) $(LIB_KIO)
## See section "dnl Not GPL compatible" in ../configure.in.in
# SUBDIRS = $(AUTOLAYOUT_DIR) classparser dialogs clipboard pics codegenerators \
headings refactoring
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic