diff options
| author | Dan McGee <dan@archlinux.org> | 2008-04-16 02:07:51 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2008-04-16 02:07:51 +0200 |
| commit | bf84c232664fdce4861a2b94ce895c2b160b355a (patch) | |
| tree | 874eac1acbf4c6f83407a32493b5053d76c72158 | |
| parent | ba70c52945c9e568100ca3a4eeb3ea1208d378ad (diff) | |
| parent | 0d8affeac01f40470c50e22cf721bd7a9b12050a (diff) | |
| download | pacman-bf84c232664fdce4861a2b94ce895c2b160b355a.tar.gz pacman-bf84c232664fdce4861a2b94ce895c2b160b355a.tar.xz | |
Merge branch 'maint'
| -rw-r--r-- | acinclude.m4 | 4 | ||||
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | lib/libalpm/Makefile.am | 5 | ||||
| -rw-r--r-- | src/pacman/.gitignore | 1 | ||||
| -rw-r--r-- | src/pacman/Makefile.am | 3 |
5 files changed, 19 insertions, 7 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 1d66dccd..1524a3dd 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -3770,7 +3770,7 @@ AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)]) # if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], - _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), + _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1), [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC])], [], [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in "" | " "*) ;; @@ -3794,7 +3794,7 @@ esac # wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\" AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], - _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1), + _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1), $lt_tmp_static_flag, [], [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=]) diff --git a/configure.ac b/configure.ac index a921c72f..aeec3f15 100644 --- a/configure.ac +++ b/configure.ac @@ -186,13 +186,20 @@ GCC_VISIBILITY_CC # Check if we have -fgnu89-inline flag GCC_GNU89_INLINE_CC -# Host-dependant flags -case "${host}" in - *-*-cygwin*) +# Host-dependant definitions +case "${host_os}" in + cygwin*) + host_os_cygwin=yes CFLAGS="$CFLAGS -DCYGWIN" ;; + darwin*) + host_os_darwin=yes + ;; esac +AM_CONDITIONAL([CYGWIN], test "x$host_os_cygwin" = "xyes") +AM_CONDITIONAL([DARWIN], test "x$host_os_darwin" = "xyes") + # Check for architecture, used in default makepkg.conf # (Note single space left after CARCHFLAGS) case "${host}" in diff --git a/lib/libalpm/Makefile.am b/lib/libalpm/Makefile.am index 8c0f742d..7b737363 100644 --- a/lib/libalpm/Makefile.am +++ b/lib/libalpm/Makefile.am @@ -10,8 +10,12 @@ DEFS = -DLOCALEDIR=\"@localedir@\" @DEFS@ AM_CFLAGS = -pedantic -D_GNU_SOURCE if ENABLE_VISIBILITY_CC +if DARWIN +AM_CFLAGS += -fvisibility=hidden +else AM_CFLAGS += -fvisibility=internal endif +endif if ENABLE_GNU89_INLINE_CC AM_CFLAGS += -fgnu89-inline endif @@ -41,5 +45,6 @@ libalpm_la_SOURCES = \ util.h util.c libalpm_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION_INFO) +libalpm_la_LIBADD = $(LTLIBINTL) # vim:set ts=2 sw=2 noet: diff --git a/src/pacman/.gitignore b/src/pacman/.gitignore index 61407057..c47851ce 100644 --- a/src/pacman/.gitignore +++ b/src/pacman/.gitignore @@ -3,3 +3,4 @@ pacman pacman.exe pacman.static +pacman.static.exe diff --git a/src/pacman/Makefile.am b/src/pacman/Makefile.am index fbb50a29..5d6fef3c 100644 --- a/src/pacman/Makefile.am +++ b/src/pacman/Makefile.am @@ -33,10 +33,9 @@ pacman_SOURCES = \ upgrade.c \ util.h util.c -pacman_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la +LDADD = $(LTLIBINTL) $(top_builddir)/lib/libalpm/.libs/libalpm.la pacman_static_SOURCES = $(pacman_SOURCES) pacman_static_LDFLAGS = $(LDFLAGS) -all-static -pacman_static_LDADD = $(top_builddir)/lib/libalpm/.libs/libalpm.la # vim:set ts=2 sw=2 noet: |