103 lines
2.1 KiB
Plaintext
103 lines
2.1 KiB
Plaintext
$OpenBSD: patch-configure,v 1.1 2012/09/10 07:42:33 ajacoutot Exp $
|
|
|
|
Fix DATADIRNAME: see LOCALBASE/share/aclocal/{glib-gettext.m4,intltool.m4}
|
|
|
|
--- configure.orig Mon May 14 17:18:42 2012
|
|
+++ configure Mon Sep 10 08:44:42 2012
|
|
@@ -5053,49 +5053,13 @@ fi
|
|
# Substitute ALL_LINGUAS so we can use it in po/Makefile
|
|
|
|
|
|
-# Set DATADIRNAME correctly if it is not set yet
|
|
-# (copied from glib-gettext.m4)
|
|
-if test -z "$DATADIRNAME"; then
|
|
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
-/* end confdefs.h. */
|
|
|
|
-int
|
|
-main ()
|
|
-{
|
|
-extern int _nl_msg_cat_cntr;
|
|
- return _nl_msg_cat_cntr
|
|
- ;
|
|
- return 0;
|
|
-}
|
|
-_ACEOF
|
|
-if ac_fn_c_try_link "$LINENO"; then :
|
|
- DATADIRNAME=share
|
|
-else
|
|
- case $host in
|
|
- *-*-solaris*)
|
|
- ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
|
|
-if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
|
|
- DATADIRNAME=share
|
|
-else
|
|
- DATADIRNAME=lib
|
|
-fi
|
|
|
|
- ;;
|
|
- *)
|
|
- DATADIRNAME=lib
|
|
- ;;
|
|
- esac
|
|
-fi
|
|
-rm -f core conftest.err conftest.$ac_objext \
|
|
- conftest$ac_exeext conftest.$ac_ext
|
|
-fi
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
-
|
|
GETTEXT_MACRO_VERSION=0.18
|
|
|
|
|
|
@@ -5466,6 +5430,45 @@ host_os=$*
|
|
IFS=$ac_save_IFS
|
|
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
|
|
|
|
+# Set DATADIRNAME correctly if it is not set yet
|
|
+# (copied from glib-gettext.m4)
|
|
+if test -z "$DATADIRNAME"; then
|
|
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
|
+/* end confdefs.h. */
|
|
+
|
|
+int
|
|
+main ()
|
|
+{
|
|
+extern int _nl_msg_cat_cntr;
|
|
+ return _nl_msg_cat_cntr
|
|
+ ;
|
|
+ return 0;
|
|
+}
|
|
+_ACEOF
|
|
+if ac_fn_c_try_link "$LINENO"; then :
|
|
+ DATADIRNAME=share
|
|
+else
|
|
+ case $host in
|
|
+ *-*-solaris*)
|
|
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
|
|
+if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then :
|
|
+ DATADIRNAME=share
|
|
+else
|
|
+ DATADIRNAME=lib
|
|
+fi
|
|
+
|
|
+ ;;
|
|
+ *-*-openbsd*)
|
|
+ DATADIRNAME=share
|
|
+ ;;
|
|
+ *)
|
|
+ DATADIRNAME=lib
|
|
+ ;;
|
|
+ esac
|
|
+fi
|
|
+rm -f core conftest.err conftest.$ac_objext \
|
|
+ conftest$ac_exeext conftest.$ac_ext
|
|
+fi
|
|
|
|
|
|
# Check whether --with-gnu-ld was given.
|