[Libirc-commits] SF.net SVN: libirc: [221] trunk/libirc

[<br...@us...>]

Revision: 221
          http://libirc.svn.sourceforge.net/libirc/?rev=221&view=rev
Author:   brlcad
Date:     2007-07-31 00:40:38 -0700 (Tue, 31 Jul 2007)

Log Message:
-----------
use BC_PATCH_LIBTOOL, add m4 to the build path

Modified Paths:
--------------
    trunk/libirc/Makefile.am
    trunk/libirc/configure.ac

Modified: trunk/libirc/Makefile.am
===================================================================
--- trunk/libirc/Makefile.am	2007-07-31 07:37:16 UTC (rev 220)
+++ trunk/libirc/Makefile.am	2007-07-31 07:40:38 UTC (rev 221)
@@ -11,6 +11,7 @@
 
 SUBDIRS = \
 	include \
+	m4 \
 	misc \
 	src \
 	$(EXAMPLES)
@@ -18,6 +19,7 @@
 DIST_SUBDIRS = \
 	examples \
 	include \
+	m4 \
 	misc \
 	src \
 	vc7.1 \

Modified: trunk/libirc/configure.ac
===================================================================
--- trunk/libirc/configure.ac	2007-07-31 07:37:16 UTC (rev 220)
+++ trunk/libirc/configure.ac	2007-07-31 07:40:38 UTC (rev 221)
@@ -612,45 +612,16 @@
 	examples/stupidBot/Makefile
 	examples/stupidBot/src/Makefile
 	include/Makefile
+	m4/Makefile
 	misc/Makefile
 	src/Makefile
 ])
 
 AC_OUTPUT
 
+# patch libtool if it has the -all_load bug
+BC_PATCH_LIBTOOL
 
-#################
-# patch libtool #
-#################
-case $host_os in
-    darwin*)
-	for script in $ac_top_builddir $ac_abs_builddir $ac_builddir . ; do
-	    if test "x$script" = "x" ; then
-		libtoolscript="libtool"
-	    else
-		libtoolscript="${script}/libtool"
-	    fi
-	    if test -f ${libtoolscript} ; then
-		if test -w ${libtoolscript} ; then
-		    # remove any -all_load option.
-		    # provokes libtool linker bug with noinst libraries.
-		    sed 's/-all_load.*convenience//g' < $libtoolscript > ${libtoolscript}.sed
-		    sed "s/temp_rpath=\$/temp_rpath=$TCL_PATH:$TK_PATH/g" < $libtoolscript.sed > ${libtoolscript}.sed2
-		    if test ! "x`cat ${libtoolscript}`" = "x`cat ${libtoolscript}.sed2`" ; then
-			AC_MSG_RESULT([Found -all_load in libtool script, removing])
-			cp ${libtoolscript}.sed2 ${libtoolscript}
-		    fi
-		    rm -f ${libtoolscript}.sed
-		    rm -f ${libtoolscript}.sed2
-		else
-		    AC_MSG_WARN([libtool script exists but is not writable so not attempting to edit])
-		fi
-	    fi
-	done
-	;;
-esac
-
-
 dnl
 dnl Expand the variables for summary reporting
 dnl


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.