From 1e0129fd7ba4b69486b5fc3c6d3fca0c174b377c Mon Sep 17 00:00:00 2001
From: root <>
Date: Sun, 8 Feb 2009 16:56:26 +0000
Subject: *** empty log message ***

---
 Makefile.am          |  2 +-
 app/Makefile.am      |  6 +++---
 app/jwg.c            |  2 +-
 configure.in         | 31 ++++++++++++++++++++++++++++++-
 libjwg-config.src.in |  4 ++--
 src/Makefile.am      |  5 ++++-
 test/Makefile.am     |  6 +++---
 test/test.c          |  2 +-
 8 files changed, 45 insertions(+), 13 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 13bc450..9586cf3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@
 # $Id$
 #
 # $Log$
-# Revision 1.1  2009/02/08 16:25:31  root
+# Revision 1.2  2009/02/08 16:56:26  root
 # *** empty log message ***
 #
 #
diff --git a/app/Makefile.am b/app/Makefile.am
index 23f3bf4..7c4cfc4 100644
--- a/app/Makefile.am
+++ b/app/Makefile.am
@@ -7,18 +7,18 @@
 # $Id$
 #
 # $Log$
-# Revision 1.1  2009/02/08 16:25:32  root
+# Revision 1.2  2009/02/08 16:56:26  root
 # *** empty log message ***
 #
 #
 #
 
-INCLUDES = -I$(srcdir)/../src 
+INCLUDES = -I$(srcdir)/../src  ${LIBGOBJ_INC}
 
 bin_PROGRAMS = jwg
 
 jwg_SOURCES = jwg.c
-jwg_LDADD = ../src/libjwg.la  
+jwg_LDADD = ../src/libjwg.la   ${LIBGOBJ_LIB}
 
 AM_CFLAGS=-g
 
diff --git a/app/jwg.c b/app/jwg.c
index 29181e6..0001493 100644
--- a/app/jwg.c
+++ b/app/jwg.c
@@ -10,7 +10,7 @@ static char rcsid[] = "$Id$";
 
 /*
  * $Log$
- * Revision 1.1  2009/02/08 16:25:32  root
+ * Revision 1.2  2009/02/08 16:56:26  root
  * *** empty log message ***
  *
  */
diff --git a/configure.in b/configure.in
index a022c98..32348bd 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ dnl
 dnl $Id$
 dnl
 dnl $Log$
-dnl Revision 1.1  2009/02/08 16:25:32  root
+dnl Revision 1.2  2009/02/08 16:56:26  root
 dnl *** empty log message ***
 dnl
 dnl
@@ -104,6 +104,35 @@ AC_SUBST(I2_HAVE_UNISTD_H)
 
 
 
+LIBGOBJ_CONFIG=no
+AC_ARG_WITH(libgobj,
+        AC_HELP_STRING([--with-libgobj=PATH],[Path to libgobj-config]),
+                LIBGOBJ_CONFIG=$with_libgobj,LIBGOBJ_CONFIG=no)
+
+case "x$LIBGOBJ_CONFIG" in
+        xno)
+		AC_PATH_PROG(LIBGOBJ_CONFIG, libgobj-config, no)
+        ;;
+        x|xyes)
+		AC_PATH_PROG(LIBGOBJ_CONFIG, libgobj-config, no)
+        ;;
+        *)
+        ;;
+esac
+
+if ! test -x $LIBGOBJ_CONFIG; then
+  AC_MSG_ERROR(can't find libgobj-config use --with-libgobj=/... option)
+fi
+
+LIBGOBJ_INC=`$LIBGOBJ_CONFIG --cflags`
+LIBGOBJ_LIB=`$LIBGOBJ_CONFIG --libs`
+
+AC_SUBST(LIBGOBJ_INC)
+AC_SUBST(LIBGOBJ_LIB)
+
+
+
+
 AC_OUTPUT([Makefile 
 	src/Makefile 
 	src/jwg-head.h
diff --git a/libjwg-config.src.in b/libjwg-config.src.in
index 56d3afb..15b1ea6 100644
--- a/libjwg-config.src.in
+++ b/libjwg-config.src.in
@@ -8,7 +8,7 @@
 # $Id$
 #
 # $Log$
-# Revision 1.1  2009/02/08 16:25:32  root
+# Revision 1.2  2009/02/08 16:56:26  root
 # *** empty log message ***
 #
 #
@@ -90,5 +90,5 @@ if test "$echo_cflags" = "yes"; then
 	echo $includes
 fi
 if test "$echo_libs" = "yes"; then
-	echo -L@libdir@ -ljwg 
+	echo -L@libdir@ -ljwg  @LIBGOBJ_LIB@
 fi
diff --git a/src/Makefile.am b/src/Makefile.am
index 17c94d8..7fe0631 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,6 +8,9 @@
 # $Id$
 #
 # $Log$
+# Revision 1.3  2009/02/08 16:56:18  root
+# *** empty log message ***
+#
 # Revision 1.2  2009/02/08 16:48:21  root
 # *** empty log message ***
 #
@@ -18,7 +21,7 @@
 #
 #
 
-INCLUDES = 
+INCLUDES = ${LIBGOBJ_INC}
 
 SRCS= libjwg.c version.c cgm.c contour.c ctext.c ftext.c version.c xfig.c
 FSRCS=ftext.f
diff --git a/test/Makefile.am b/test/Makefile.am
index a91ca3b..2b9db52 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -7,18 +7,18 @@
 # $Id$
 #
 # $Log$
-# Revision 1.1  2009/02/08 16:25:32  root
+# Revision 1.2  2009/02/08 16:56:26  root
 # *** empty log message ***
 #
 #
 #
 
-INCLUDES = -I$(srcdir)/../src 
+INCLUDES = -I$(srcdir)/../src  ${LIBGOBJ_INC}
 
 noinst_PROGRAMS = test
 
 test_SOURCES = test.c
-test_LDADD = ../src/libjwg.a  
+test_LDADD = ../src/libjwg.a   ${LIBGOBJ_LIB}
 
 AM_CFLAGS=-g
 
diff --git a/test/test.c b/test/test.c
index 51e6f59..4de2815 100644
--- a/test/test.c
+++ b/test/test.c
@@ -10,7 +10,7 @@ static char rcsid[] = "$Id$";
 
 /*
  * $Log$
- * Revision 1.1  2009/02/08 16:25:32  root
+ * Revision 1.2  2009/02/08 16:56:26  root
  * *** empty log message ***
  *
  */
-- 
cgit v1.2.3