Changeset 23714

Timestamp:

2011-02-16T14:13:14+13:00 (13 years ago)

Author:

sjm84

Message:

Added a mac-specific version of libiconv to fix issues with the 1.13.1 version conflicting with the system version. This mac-specific 1.11 version is the same as the system version but it needed to be included because the system does not contain a static version of the library and we need a static version for mgpp and library.cgi

Location:

main/trunk/greenstone2/common-src/packages

Files:

• configure (modified) (1 diff)
• iconv/libiconv-1.11.tar.gz (added)

main/trunk/greenstone2/common-src/packages/configure

@@ -187 +187 @@
 echo ""
 cd "$PACKAGES/iconv"
-if test ! -d libiconv-1.13.1 ;
-then
-  gzip -dc libiconv-1.13.1.tar.gz | tar -xf -
-fi
-
-cd "$PACKAGES/iconv/libiconv-1.13.1"
-
-if test -e Makefile ; then
-  echo make distclean && \
-  make distclean
+
+# Darwin requires a different version of iconv than the one we use for Linux
+if test $GSDLOS != darwin ; then
+
+    if test ! -d libiconv-1.13.1 ; then
+    gzip -dc libiconv-1.13.1.tar.gz | tar -xf -
+    fi
+    cd "$PACKAGES/iconv/libiconv-1.13.1"
+else
+    if test ! -d libiconv-1.11 ; then
+    gzip -dc libiconv-1.11.tar.gz | tar -xf -
+    fi
+    cd "$PACKAGES/iconv/libiconv-1.11"
+fi
+
+if test -e Makefile ; then  
+    echo make distclean && \
+    make distclean
 fi
 
 # configure
-echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --enable-shared --enable-static --prefix="$PACKAGES/iconv" $HOSTTARGETFLAGS $ENVIRONMENT
+    echo CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --enable-shared --enable-static --prefix="$PACKAGES/iconv" $HOSTTARGETFLAGS $ENVIRONMENT
 CFLAGS="$CFLAGS $COMPAT32BITFLAGS" CXXFLAGS="$CXXFLAGS $COMPAT32BITFLAGS" LDFLAGS="$LDFLAGS $COMPAT32BITFLAGS" ./configure $CACHE_FILE --enable-shared --enable-static --prefix="$PACKAGES/iconv" $HOSTTARGETFLAGS $ENVIRONMENT