|
Removed
Link Here
|
| 1 |
--- configure.in.orig 2007-06-26 21:50:57.000000000 +0200 |
| 2 |
+++ configure.in 2007-12-30 13:45:21.995543476 +0100 |
| 3 |
@@ -60,8 +60,8 @@ |
| 4 |
|
| 5 |
CFLAGS="$CFLAGS -Wall -Wpointer-arith" |
| 6 |
if test ! -f /usr/include/iconv.h -a -f /usr/local/include/iconv.h ; then |
| 7 |
- CFLAGS+=" -I/usr/local/include" |
| 8 |
- LIBS+=" -L/usr/local/lib" |
| 9 |
+ CFLAGS="$CFLAGS -I/usr/local/include" |
| 10 |
+ LIBS="$LIBS -L/usr/local/lib" |
| 11 |
fi |
| 12 |
|
| 13 |
dnl Checks for programs. |
| 14 |
@@ -103,7 +103,33 @@ |
| 15 |
AC_SUBST(GTK1_LIBS) |
| 16 |
AC_SUBST(GTK1_INCLUDES) |
| 17 |
|
| 18 |
-PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.0.0, HAVE_GTK2=yes, HAVE_GTK2=no) |
| 19 |
+dnl *** |
| 20 |
+dnl *** GLIB 2.0 |
| 21 |
+dnl *** |
| 22 |
+AC_ARG_ENABLE(glib2, |
| 23 |
+ [ --disable-glib2 disable glib2 [default=enabled]],, |
| 24 |
+ enable_glib2="yes") |
| 25 |
+ |
| 26 |
+if test "x$enable_glib2" = "xyes"; then |
| 27 |
+ PKG_CHECK_MODULES(GLIB2, glib-2.0 >= 2.0.0, HAVE_GLIB2=yes, HAVE_GLIB2=no) |
| 28 |
+else |
| 29 |
+ HAVE_GLIB2=no |
| 30 |
+fi |
| 31 |
+AM_CONDITIONAL(HAVE_GLIB2, [ test $HAVE_GLIB2 = yes ]) |
| 32 |
+ |
| 33 |
+ |
| 34 |
+dnl *** |
| 35 |
+dnl *** GTK 2.0 |
| 36 |
+dnl *** |
| 37 |
+AC_ARG_ENABLE(gtk2, |
| 38 |
+ [ --disable-gtk2 disable gtk2 [default=enabled]],, |
| 39 |
+ enable_gtk2="yes") |
| 40 |
+ |
| 41 |
+if test "x$enable_gtk2" = "xyes"; then |
| 42 |
+ PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.0.0, HAVE_GTK2=yes, HAVE_GTK2=no) |
| 43 |
+else |
| 44 |
+ HAVE_GTK2=no |
| 45 |
+fi |
| 46 |
AM_CONDITIONAL(HAVE_GTK2, [ test $HAVE_GTK2 = yes ]) |
| 47 |
|
| 48 |
AC_CHECK_HEADER(dlfcn.h, [AC_CHECK_LIB(dl, dlopen, [ |
| 49 |
@@ -130,12 +156,12 @@ |
| 50 |
if test "x$enable_force_system_iconv" != "xyes"; then |
| 51 |
AC_CHECK_LIB(iconv, iconv_open, [ |
| 52 |
EXTERNAL_ICONV=yes |
| 53 |
- EXTRA_LIBS+=" -liconv" |
| 54 |
+ EXTRA_LIBS="$EXTRA_LIBS -liconv" |
| 55 |
]) |
| 56 |
AC_CHECK_HEADER(libcharset.h, [AC_CHECK_LIB(charset, locale_charset, [ |
| 57 |
AC_DEFINE(HAVE_LIBCHARSET,1,[Defines if libRCD is available]) |
| 58 |
HAVE_LIBCHARSET=yes |
| 59 |
- EXTRA_LIBS+=" -lcharset" |
| 60 |
+ EXTRA_LIBS="$EXTRA_LIBS -lcharset" |
| 61 |
])]) |
| 62 |
fi |
| 63 |
AM_CONDITIONAL(HAVE_LIBCHARSET, [ test "x$HAVE_LIBCHARSET" = "xyes" ]) |
| 64 |
@@ -210,23 +236,20 @@ |
| 65 |
BDB_INCLUDES="" |
| 66 |
HAVE_BDB=no |
| 67 |
else |
| 68 |
- AX_PATH_BDB([4],[ |
| 69 |
- BDB_LIBS="$BDB_LDFLAGS $BDB_LIBS" |
| 70 |
- BDB_INCLUDES="$BDB_CPPFLAGS" |
| 71 |
- HAVE_BDB=yes |
| 72 |
- ],[ |
| 73 |
- BDB_LIBS="" |
| 74 |
- BDB_INCLUDES="" |
| 75 |
- HAVE_BDB=no |
| 76 |
- ]) |
| 77 |
+# Not working on FreeBSD either |
| 78 |
+# AX_PATH_BDB([4],[ |
| 79 |
+# BDB_LIBS="$BDB_LDFLAGS $BDB_LIBS" |
| 80 |
+# BDB_INCLUDES="$BDB_CPPFLAGS" |
| 81 |
+# HAVE_BDB=yes |
| 82 |
+# ],[ |
| 83 |
+# BDB_LIBS="" |
| 84 |
+# BDB_INCLUDES="" |
| 85 |
+# HAVE_BDB=no |
| 86 |
+# ]) |
| 87 |
fi |
| 88 |
AC_SUBST(BDB_LIBS) |
| 89 |
AC_SUBST(BDB_INCLUDES) |
| 90 |
|
| 91 |
-PKG_CHECK_MODULES(GLIB2, glib-2.0 >= 2.0.0, HAVE_GLIB2=yes, HAVE_GLIB2=no) |
| 92 |
-AM_CONDITIONAL(HAVE_GLIB2, [ test $HAVE_GLIB2 = yes ]) |
| 93 |
- |
| 94 |
- |
| 95 |
if test "x$disable_libtranslate" != "xyes"; then |
| 96 |
HAVE_LIBTRANSLATE=no |
| 97 |
HAVE_LIBTRANSLATE_TIMED_TRANSLATE=no |
| 98 |
@@ -254,15 +277,25 @@ |
| 99 |
fi |
| 100 |
fi |
| 101 |
|
| 102 |
-AM_PATH_ASPELL([ |
| 103 |
- AC_DEFINE(HAVE_ASPELL,1,[Defines if aspell is available]) |
| 104 |
- HAVE_ASPELL=yes |
| 105 |
-],[ |
| 106 |
+# Not available on FreeBSD? breaks autom4te run |
| 107 |
+#AM_PATH_ASPELL([ |
| 108 |
+# AC_DEFINE(HAVE_ASPELL,1,[Defines if aspell is available]) |
| 109 |
+# HAVE_ASPELL=yes |
| 110 |
+#],[ |
| 111 |
HAVE_ASPELL=no |
| 112 |
-]) |
| 113 |
+ AC_SUBST(ASPELL_CFLAGS) |
| 114 |
+ AC_SUBST(ASPELL_LIBS) |
| 115 |
+#]) |
| 116 |
|
| 117 |
|
| 118 |
-PTHREAD_LIBS=error |
| 119 |
+AC_MSG_CHECKING([for PTHREAD_LIBS]) |
| 120 |
+if test "x$PTHREAD_LIBS" = "x"; then |
| 121 |
+ PTHREAD_LIBS=error |
| 122 |
+else |
| 123 |
+ AC_MSG_RESULT([$PTHREAD_LIBS]) |
| 124 |
+fi |
| 125 |
+ |
| 126 |
+if test "x$PTHREAD_LIBS" = "xerror"; then |
| 127 |
AC_EGREP_CPP(yes,[ |
| 128 |
#if (defined(__FreeBSD_cc_version) && __FreeBSD_cc_version <= 500001) || defined(__OpenBSD__) |
| 129 |
yes |
| 130 |
@@ -271,6 +304,7 @@ |
| 131 |
PTHREAD_CFLAGS="-D_THREAD_SAFE" |
| 132 |
PTHREAD_LIBS="-pthread" |
| 133 |
) |
| 134 |
+fi |
| 135 |
if test "x$PTHREAD_LIBS" = "xerror"; then |
| 136 |
AC_CHECK_LIB(pthread, pthread_mutex_lock, PTHREAD_LIBS="-lpthread") |
| 137 |
fi |
| 138 |
@@ -309,7 +343,7 @@ |
| 139 |
AC_OUTPUT(src/Makefile engines/Makefile external/Makefile ui/Makefile examples/Makefile Makefile librcc.spec) |
| 140 |
|
| 141 |
rccdir=${pkgdatadir} |
| 142 |
-while expr ${rccdir:0:1} == '$' &>/dev/null; do |
| 143 |
+while expr "${rccdir}" : "\\\$" >/dev/null; do |
| 144 |
rccdir=`eval echo $rccdir` |
| 145 |
done |
| 146 |
|