[Lemon-commits] [lemon_svn] alpar: r3012 - glemon/trunk

[Lemon SVN]

Author: alpar
Date: Sun Oct 22 11:26:51 2006
New Revision: 3012

Modified:
   glemon/trunk/Makefile.am
   glemon/trunk/configure.ac

Log:
Fix the compilation environment:
- svn-head -> svnhead
- put -lemon to the right place

Modified: glemon/trunk/Makefile.am
==============================================================================
--- glemon/trunk/Makefile.am	(original)
+++ glemon/trunk/Makefile.am	Sun Oct 22 11:26:51 2006
@@ -49,8 +49,8 @@
 	dijkstrabox.cc
 
 glemon_CXXFLAGS = $(GTK_CFLAGS) $(LEMON_CFLAGS)
-glemon_LDFLAGS = $(GTK_LIBS) $(LEMON_LIBS)
-glemon_LDADD = $(LIBINTL)
+# glemon_LDFLAGS = $(GTK_LIBS) $(LEMON_LIBS)
+glemon_LDADD = $(GTK_LIBS) $(LEMON_LIBS) $(LIBINTL)
 
 IMAGES = \
 	icons/addlink.png \

Modified: glemon/trunk/configure.ac
==============================================================================
--- glemon/trunk/configure.ac	(original)
+++ glemon/trunk/configure.ac	Sun Oct 22 11:26:51 2006
@@ -26,7 +26,7 @@
   [lemon_0_5_found=yes], [
     AC_MSG_RESULT([no])
     lemon_0_5_found=no])
-PKG_CHECK_MODULES([LEMON_SVN_HEAD], [lemon = svn-head],
+PKG_CHECK_MODULES([LEMON_SVNHEAD], [lemon = svnhead],
   [lemon_svn_head_found=yes], [
     AC_MSG_RESULT([no])
     lemon_svn_head_found=no])
@@ -34,8 +34,8 @@
   AC_MSG_ERROR([LEMON not found.])
 else
   if test x"$lemon_svn_head_found" = x"yes"; then
-    LEMON_CFLAGS="$LEMON_SVN_HEAD_CFLAGS"
-    LEMON_LIBS="$LEMON_SVN_HEAD_LIBS"
+    LEMON_CFLAGS="$LEMON_SVNHEAD_CFLAGS"
+    LEMON_LIBS="$LEMON_SVNHEAD_LIBS"
   else
     LEMON_CFLAGS="$LEMON_0_5_CFLAGS"
     LEMON_LIBS="$LEMON_0_5_LIBS"
@@ -62,3 +62,24 @@
 ])
 
 AC_OUTPUT
+
+echo
+echo '****************************** SUMMARY ******************************'
+echo
+echo Package version............... : $PACKAGE-$VERSION
+echo
+echo C++ compiler.................. : $CXX
+echo C++ compiles flags............ : $CXXFLAGS
+echo
+echo LEMON CFLAGS.................. : $LEMON_CFLAGS
+echo LEMON LIBS.................... : $LEMON_LIBS
+echo
+echo The packace will be installed in
+echo -n '  '
+echo $prefix.
+echo
+echo '*********************************************************************'
+
+echo
+echo configure complete, now type \'make\' and then \'make install\'.
+echo