r2014 - in trunk

[dslinux_gpf at dslinux.in-berlin.de]

Author: gpf
Date: 2007-10-19 19:56:47 +0200 (Fri, 19 Oct 2007)
New Revision: 2014

Log:
removed pkg-config dependence from irssi

Modified: trunk/include/Makefile
===================================================================
--- trunk/include/Makefile	2007-10-19 16:17:56 UTC (rev 2013)
+++ trunk/include/Makefile	2007-10-19 17:56:47 UTC (rev 2014)
@@ -68,7 +68,9 @@
 	$(ROOTDIR)/lib/libwww/src/modules/md5/md5.h,. \
 	$(ROOTDIR)/lib/libiconv/src/include/iconv.h,. \
 	$(ROOTDIR)/lib/gettext/src/gettext-runtime/intl/libintl.h,. \
-	$(ROOTDIR)/lib/glib/src/glib/glib.h,. 
+	$(ROOTDIR)/lib/glib/src/glib/glib.h,. \
+	$(ROOTDIR)/lib/glib/src/glibconfig.h,. \
+	$(ROOTDIR)/lib/glib/src/glib/,glib 
 
 #
 # Both freeswan and openswan can provide des and crypto headers

Modified: trunk/lib/libiconv/Makefile
===================================================================
--- trunk/lib/libiconv/Makefile	2007-10-19 16:17:56 UTC (rev 2013)
+++ trunk/lib/libiconv/Makefile	2007-10-19 17:56:47 UTC (rev 2014)
@@ -13,6 +13,7 @@
 
 .compiled: .configured
 	$(MAKE) -C src
+	ln -s $(ROOTDIR)/lib/libiconv/src/include/iconv.h $(ROOTDIR)/include/iconv.h 
 	touch $@
 
 clean:

Modified: trunk/user/irssi/Makefile
===================================================================
--- trunk/user/irssi/Makefile	2007-10-19 16:17:56 UTC (rev 2013)
+++ trunk/user/irssi/Makefile	2007-10-19 17:56:47 UTC (rev 2014)
@@ -7,9 +7,9 @@
 
 .configured:
 	cd src && env CFLAGS="$(CFLAGS)" \
+		 PKG_CONFIG=no \
 		./configure --build i386 --host none-uclinux-uclibc  \
 		--prefix=/usr $(IRSSI_CONFIGURE_FLAGS)
-	sed -i -r 's@\-ldl at -lintl -liconv at g' src/src/fe-text/Makefile
 	touch $@
 
 .compiled: .configured

Modified: trunk/user/irssi/src/configure
===================================================================
--- trunk/user/irssi/src/configure	2007-10-19 16:17:56 UTC (rev 2013)
+++ trunk/user/irssi/src/configure	2007-10-19 17:56:47 UTC (rev 2014)
@@ -23802,10 +23802,10 @@
 
   { { echo "$as_me:$LINENO: error: GLIB is required to build irssi." >&5
 echo "$as_me: error: GLIB is required to build irssi." >&2;}
-   { (exit 1); exit 1; }; }
+   { (echo 1); echo 1; }; }
 fi
 
-LIBS="$LIBS $GLIB_LIBS"
+LIBS="$LIBS -lgmodule-2.0 -lglib-2.0 -lintl -liconv "
 
 have_openssl=no
 if test "$enable_ssl" = "yes"; then