diff options
| author |  Jonathan Beck | 2009-03-24 20:58:43 +0100 |
|---|---|---|
| committer | Jonathan Beck | 2009-03-24 20:58:43 +0100 |
| commit | 85b8a301be39c4b86cb7f38e80c3cb592240ccb9 (patch) | |
| tree | 4974fc254afbf0226e610fd962b5dc74c094cf9f /configure.ac | |
| parent | 19992c668afeb53a28e08a1f61572b5379f87590 (diff) | |
| parent | 0114d8da493e69f14bc2669ae0ec6b9813b237cf (diff) | |
| download | libimobiledevice-85b8a301be39c4b86cb7f38e80c3cb592240ccb9.tar.gz libimobiledevice-85b8a301be39c4b86cb7f38e80c3cb592240ccb9.tar.bz2 | |
Merge branch 'master' of git://github.com/MattColyer/libiphone into contact_sync
Conflicts:
Makefile.am
configure.ac
src/AFC.h
src/NotificationProxy.c
src/lockdown.c
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index a91d9f9..29f9be3 100644 --- a/configure.ac +++ b/configure.ac | |||
| @@ -95,5 +95,4 @@ if test "$enable_largefile" != no; then | |||
| 95 | fi | 95 | fi |
| 96 | AC_SUBST(LFS_CFLAGS) | 96 | AC_SUBST(LFS_CFLAGS) |
| 97 | 97 | ||
| 98 | AC_OUTPUT(Makefile src/Makefile include/Makefile fdi/Makefile dev/Makefile swig/Makefile libiphone-1.0.pc) | 98 | AC_OUTPUT(Makefile src/Makefile include/Makefile fdi/Makefile dev/Makefile swig/Makefile udev/Makefile libiphone-1.0.pc) |
| 99 | |||